partially fix MessagingManager shutdown

Hexaoxide · Aug 8, 2023 · 26794a5 · 26794a5
1 parent 9f626b4
commit 26794a5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/common/src/main/java/net/draycia/carbon/common/CarbonChatInternal.java b/common/src/main/java/net/draycia/carbon/common/CarbonChatInternal.java
@@ -141,9 +141,8 @@ protected void init() {
     protected void shutdown() {
         this.messagingManager.get().withPacketService(packetService -> {
             packetService.queuePacket(this.injector.getInstance(PacketFactory.class).clearLocalPlayersPacket());
-            packetService.flushQueue(); // todo remove
         });
-        // this.messagingManager.get().onShutdown(); // todo fix this taking so long
+        this.messagingManager.get().onShutdown();
         ConcurrentUtil.shutdownExecutor(this.periodicTasks, TimeUnit.MILLISECONDS, 500);
         this.profileCache.save();
         this.profileResolver.shutdown();

diff --git a/common/src/main/java/net/draycia/carbon/common/messaging/MessagingManager.java b/common/src/main/java/net/draycia/carbon/common/messaging/MessagingManager.java
@@ -176,14 +176,14 @@ public void withPacketService(final Consumer<PacketService> consumer) {
     }
 
     public void onShutdown() {
+        if (this.scheduledExecutor != null) {
+            ConcurrentUtil.shutdownExecutor(this.scheduledExecutor, TimeUnit.MILLISECONDS, 500);
+        }
         if (this.packetService != null) {
             this.packetService.flushQueue();
             this.packetService.shutdown();
         }
-        if (this.scheduledExecutor != null) {
-            ConcurrentUtil.shutdownExecutor(this.scheduledExecutor, TimeUnit.MILLISECONDS, 500);
-        }
-        this.messagingService.close();
+        // this.messagingService.close(); // todo - this is really slow, easier to just skip for now
     }
 
     private void initMessagingService(