fix unnecessary saves & missing save complete packets

Hexaoxide · Aug 19, 2023 · ed3fcf3 · ed3fcf3
1 parent dc9d9b0
commit ed3fcf3
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/common/src/main/java/net/draycia/carbon/common/users/CachingUserManager.java b/common/src/main/java/net/draycia/carbon/common/users/CachingUserManager.java
@@ -76,7 +76,14 @@ protected CachingUserManager(
     protected abstract void saveSync(CarbonPlayerCommon player);
 
     private CompletableFuture<Void> save(final CarbonPlayerCommon player) {
-        return CompletableFuture.runAsync(() -> this.saveSync(player), this.executor);
+        return CompletableFuture.runAsync(() -> {
+            this.saveSync(player);
+            player.saved();
+            this.messagingManager.get().withPacketService(packetService -> {
+                packetService.queuePacket(this.packetFactory.saveCompletedPacket(player.uuid()));
+                packetService.flushQueue();
+            });
+        }, this.executor);
     }
 
     @Override
@@ -94,13 +101,7 @@ public CompletableFuture<Void> saveIfNeeded(final CarbonPlayerCommon player) {
         if (!player.needsSave()) {
             return CompletableFuture.completedFuture(null);
         }
-        return this.save(player).whenComplete(($, $$) -> {
-            player.saved();
-            this.messagingManager.get().withPacketService(packetService -> {
-                packetService.queuePacket(this.packetFactory.saveCompletedPacket(player.uuid()));
-                packetService.flushQueue();
-            });
-        });
+        return this.save(player);
     }
 
     @Override