diff --git a/Server/src/main/java/core/game/system/SystemManager.java b/Server/src/main/java/core/game/system/SystemManager.java index 67c942e5d..48685fdb3 100644 --- a/Server/src/main/java/core/game/system/SystemManager.java +++ b/Server/src/main/java/core/game/system/SystemManager.java @@ -1,7 +1,6 @@ package core.game.system; import core.game.system.security.EncryptionManager; -import gui.ServerMonitor; import rs09.game.world.GameWorld; /** diff --git a/Server/src/main/kotlin/rs09/Server.kt b/Server/src/main/kotlin/rs09/Server.kt index a2e6c41db..d030a0ee8 100644 --- a/Server/src/main/kotlin/rs09/Server.kt +++ b/Server/src/main/kotlin/rs09/Server.kt @@ -7,7 +7,6 @@ import core.gui.ConsoleFrame import core.net.NioReactor import core.net.amsc.WorldCommunicator import core.tools.TimeStamp -import gui.ServerMonitor import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/Server/src/main/kotlin/rs09/game/system/SystemLogger.kt b/Server/src/main/kotlin/rs09/game/system/SystemLogger.kt index 1d3f19615..af4dcfc35 100644 --- a/Server/src/main/kotlin/rs09/game/system/SystemLogger.kt +++ b/Server/src/main/kotlin/rs09/game/system/SystemLogger.kt @@ -3,7 +3,6 @@ package rs09.game.system import com.github.ajalt.mordant.rendering.TextColors import com.github.ajalt.mordant.terminal.Terminal import gui.GuiEvent -import gui.ServerMonitor import rs09.ServerConstants import java.io.* import java.text.SimpleDateFormat @@ -47,7 +46,6 @@ object SystemLogger { val msg = "${getTime()}: [INFO] $m" if(m.isNotBlank()) { t.println(msg) - ServerMonitor.eventQueue.add(GuiEvent.AddDefaultMessage(msg)) } } } @@ -57,7 +55,6 @@ object SystemLogger { val msg = "${getTime()}: [ ERR] $message" if(message.isNotBlank()) { t.println(msg) - ServerMonitor.eventQueue.add(GuiEvent.AddDebugMessage(msg)) } } @@ -66,7 +63,6 @@ object SystemLogger { val msg = "${getTime()}: [WARN] $message" if(message.isNotBlank()) { t.println(msg) - ServerMonitor.eventQueue.add(GuiEvent.AddDebugMessage(msg)) } } @@ -75,7 +71,6 @@ object SystemLogger { val msg = "${getTime()}: [ALRT] $message" if(message.isNotBlank()) { t.println(msg) - ServerMonitor.eventQueue.add(GuiEvent.AddDebugMessage(msg)) } } @@ -84,7 +79,6 @@ object SystemLogger { val msg = "${getTime()}: [AIPL] $message" if(message.isNotBlank()) { t.println(msg) - ServerMonitor.eventQueue.add(GuiEvent.AddAIPMessage(msg)) } } diff --git a/Server/src/main/kotlin/rs09/net/packet/PacketWriteQueue.kt b/Server/src/main/kotlin/rs09/net/packet/PacketWriteQueue.kt index 445ad9f9f..e97f1e956 100644 --- a/Server/src/main/kotlin/rs09/net/packet/PacketWriteQueue.kt +++ b/Server/src/main/kotlin/rs09/net/packet/PacketWriteQueue.kt @@ -3,7 +3,6 @@ package rs09.net.packet import core.net.packet.OutgoingPacket import core.net.packet.out.* import gui.GuiEvent -import gui.ServerMonitor import rs09.game.system.SystemLogger import java.util.* @@ -30,7 +29,6 @@ object PacketWriteQueue { @JvmStatic fun flush(){ - ServerMonitor.eventQueue.add(GuiEvent.UpdateQueuedPackets(PacketsToWrite.size)) while(!PacketsToWrite.isEmpty()){ val p = PacketsToWrite.poll() ?: continue write(p.out,p.context) diff --git a/Server/src/main/kotlin/rs09/worker/MajorUpdateWorker.kt b/Server/src/main/kotlin/rs09/worker/MajorUpdateWorker.kt index 103424533..b13c68967 100644 --- a/Server/src/main/kotlin/rs09/worker/MajorUpdateWorker.kt +++ b/Server/src/main/kotlin/rs09/worker/MajorUpdateWorker.kt @@ -6,7 +6,6 @@ import core.game.system.SystemState import core.game.system.task.Pulse import core.plugin.CorePluginTypes.Managers import gui.GuiEvent -import gui.ServerMonitor import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch @@ -118,8 +117,6 @@ class MajorUpdateWorker { } val end = System.currentTimeMillis() - ServerMonitor.eventQueue.add(GuiEvent.UpdateTickTime(end - start)) - ServerMonitor.eventQueue.add(GuiEvent.UpdatePulseCount(GameWorld.Pulser.TASKS.size)) Thread.sleep(max(600 - (end - start), 0)) } }