Fix inventory clearing on world save

WiIIiam278 · Jun 8, 2022 · 633847a · 633847a
1 parent 3cd1440
commit 633847a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/bukkit/src/main/java/net/william278/husksync/HuskSyncBukkit.java b/bukkit/src/main/java/net/william278/husksync/HuskSyncBukkit.java
@@ -145,6 +145,10 @@ public void onDisable() {
             getLogger().info("Saving data for remaining online players...");
             for (Player player : Bukkit.getOnlinePlayers()) {
                 PlayerSetter.updatePlayerData(player, false);
+
+                // Clear player inventory and ender chest
+                player.getInventory().clear();
+                player.getEnderChest().clear();
             }
             getLogger().info("Data save complete!");
         }

diff --git a/bukkit/src/main/java/net/william278/husksync/bukkit/listener/BukkitEventListener.java b/bukkit/src/main/java/net/william278/husksync/bukkit/listener/BukkitEventListener.java
@@ -39,7 +39,14 @@ public void onPlayerQuit(PlayerQuitEvent event) {
             return; // If the plugin has not been initialized correctly
 
         // Update the player's data
-        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> PlayerSetter.updatePlayerData(player, true));
+        Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+            // Update data to proxy
+            PlayerSetter.updatePlayerData(player, true);
+
+            // Clear player inventory and ender chest
+            player.getInventory().clear();
+            player.getEnderChest().clear();
+        });
     }
 
     @EventHandler(priority = EventPriority.LOWEST)

diff --git a/bukkit/src/main/java/net/william278/husksync/bukkit/util/PlayerSetter.java b/bukkit/src/main/java/net/william278/husksync/bukkit/util/PlayerSetter.java
@@ -108,10 +108,6 @@ public static void updatePlayerData(Player player, boolean bounceBack) {
         } catch (IOException e) {
             plugin.getLogger().log(Level.SEVERE, "Failed to send a PlayerData update to the proxy", e);
         }
-
-        // Clear player inventory and ender chest
-        player.getInventory().clear();
-        player.getEnderChest().clear();
     }
 
     /**