From f2625b1f3d9cb56bd403f063d566b6f8cd886018 Mon Sep 17 00:00:00 2001 From: dam <27978131-real_damighty@users.noreply.gitlab.com> Date: Fri, 3 Jul 2026 20:48:29 +0300 Subject: [PATCH] Static clearQueue() to PacketProcessor --- Server/src/main/core/net/packet/PacketProcessor.kt | 6 ++++++ Server/src/test/kotlin/content/CombatMovementTests.kt | 2 +- Server/src/test/kotlin/content/CombatPerformanceTests.kt | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Server/src/main/core/net/packet/PacketProcessor.kt b/Server/src/main/core/net/packet/PacketProcessor.kt index c05798490..b839aade1 100644 --- a/Server/src/main/core/net/packet/PacketProcessor.kt +++ b/Server/src/main/core/net/packet/PacketProcessor.kt @@ -71,6 +71,12 @@ object PacketProcessor { } } + @JvmStatic fun clearQueue() { + synchronized(queueLock) { + queue.clear() + } + } + @JvmStatic fun processQueue() { synchronized(queueLock) { if (queue.isEmpty()) { diff --git a/Server/src/test/kotlin/content/CombatMovementTests.kt b/Server/src/test/kotlin/content/CombatMovementTests.kt index 62038f421..30019c57e 100644 --- a/Server/src/test/kotlin/content/CombatMovementTests.kt +++ b/Server/src/test/kotlin/content/CombatMovementTests.kt @@ -199,7 +199,7 @@ class CombatMovementTests { enableRun(victim) enablePvp(attacker, victim) CombatMovementIntents.clear() - PacketProcessor.queue.clear() + PacketProcessor.clearQueue() TestUtils.advanceTicks(1, false) CombatMovementIntents.clear() diff --git a/Server/src/test/kotlin/content/CombatPerformanceTests.kt b/Server/src/test/kotlin/content/CombatPerformanceTests.kt index 2a337fa93..5b81032a6 100644 --- a/Server/src/test/kotlin/content/CombatPerformanceTests.kt +++ b/Server/src/test/kotlin/content/CombatPerformanceTests.kt @@ -100,7 +100,7 @@ class CombatPerformanceTests { } private fun measureCombatTick(load: CombatLoad, tick: Int): Long { - PacketProcessor.queue.clear() + PacketProcessor.clearQueue() load.resetPairPositionsAndMovement(tick) load.requestAllCombatMovement() @@ -175,7 +175,7 @@ class CombatPerformanceTests { } GameWorld.Pulser.updateAll() UpdateSequence.renderablePlayers.sync() - PacketProcessor.queue.clear() + PacketProcessor.clearQueue() GameWorld.settings!!.wild_pvp_enabled = previousWildPvp }