Fix unsafe joins on inventory and ender chest commands, better exception catching, Close #58

bukkit/src/main/java/net/william278/husksync/player/BukkitPlayer.java

@@ -573,7 +573,6 @@ public class BukkitPlayer extends OnlineUser {
 
         // Deserialize the item data to be shown and show it in a triumph GUI
         BukkitSerializer.deserializeItemStackArray(itemData.serializedItems).thenAccept(items -> {
-            try {
             // Build the GUI and populate with items
             final int itemCount = items.length;
             final StorageBuilder guiBuilder = Gui.storage()
@@ -609,9 +608,10 @@ public class BukkitPlayer extends OnlineUser {
 
             // Display the GUI (synchronously; on the main server thread)
             Bukkit.getScheduler().runTask(BukkitHuskSync.getInstance(), () -> gui.open(player));
-            } catch (Exception e) {
+        }).exceptionally(throwable -> {
-                e.printStackTrace();
+            // Handle exceptions
-            }
+            updatedData.completeExceptionally(throwable);
+            return null;
         });
         return updatedData;
     }

bukkit/src/main/java/net/william278/husksync/util/BukkitLogger.java

@@ -13,7 +13,7 @@ public class BukkitLogger extends Logger {
     }
 
     @Override
-    public void log(@NotNull Level level, @NotNull String message, @NotNull Exception e) {
+    public void log(@NotNull Level level, @NotNull String message, @NotNull Throwable e) {
         logger.log(level, message, e);
     }
 

common/src/main/java/net/william278/husksync/command/EnderChestCommand.java

@@ -12,8 +12,10 @@ import org.jetbrains.annotations.NotNull;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 public class EnderChestCommand extends CommandBase implements TabCompletable {
@@ -68,7 +70,12 @@ public class EnderChestCommand extends CommandBase implements TabCompletable {
                 // Show inventory menu
                 player.showMenu(itemData, allowEdit, 3, plugin.getLocales()
                                 .getLocale("ender_chest_viewer_menu_title", dataOwner.username)
-                        .orElse(new MineDown("Ender Chest Viewer"))).thenAccept(dataOnClose -> {
+                                .orElse(new MineDown("Ender Chest Viewer")))
+                        .exceptionally(throwable -> {
+                            plugin.getLoggingAdapter().log(Level.WARNING, "Exception displaying inventory menu to " + player.username, throwable);
+                            return Optional.empty();
+                        })
+                        .thenAccept(dataOnClose -> {
                             if (dataOnClose.isEmpty() || !allowEdit) {
                                 return;
                             }
@@ -86,8 +93,9 @@ public class EnderChestCommand extends CommandBase implements TabCompletable {
 
                             // Set the updated data
                             final UserData updatedUserData = builder.build();
-                    plugin.getDatabase().setUserData(dataOwner, updatedUserData, DataSaveCause.INVENTORY_COMMAND).join();
+                            plugin.getDatabase()
-                    plugin.getRedisManager().sendUserDataUpdate(dataOwner, updatedUserData).join();
+                                    .setUserData(dataOwner, updatedUserData, DataSaveCause.INVENTORY_COMMAND)
+                                    .thenRun(() -> plugin.getRedisManager().sendUserDataUpdate(dataOwner, updatedUserData));
                         });
             });
         });

common/src/main/java/net/william278/husksync/command/InventoryCommand.java

@@ -12,8 +12,10 @@ import org.jetbrains.annotations.NotNull;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 public class InventoryCommand extends CommandBase implements TabCompletable {
@@ -69,13 +71,15 @@ public class InventoryCommand extends CommandBase implements TabCompletable {
                 player.showMenu(itemData, allowEdit, 5, plugin.getLocales()
                                 .getLocale("inventory_viewer_menu_title", dataOwner.username)
                                 .orElse(new MineDown("Inventory Viewer")))
+                        .exceptionally(throwable -> {
+                            plugin.getLoggingAdapter().log(Level.WARNING, "Exception displaying inventory menu to " + player.username, throwable);
+                            return Optional.empty();
+                        })
                         .thenAccept(dataOnClose -> {
                             if (dataOnClose.isEmpty() || !allowEdit) {
                                 return;
                             }
 
-                            plugin.getLoggingAdapter().debug("Inventory data changed, updating user, etc!");
-
                             // Create the updated data
                             final UserDataBuilder builder = UserData.builder(plugin.getMinecraftVersion());
                             data.getStatus().ifPresent(builder::setStatus);
@@ -89,8 +93,9 @@ public class InventoryCommand extends CommandBase implements TabCompletable {
 
                             // Set the updated data
                             final UserData updatedUserData = builder.build();
-                            plugin.getDatabase().setUserData(dataOwner, updatedUserData, DataSaveCause.INVENTORY_COMMAND).join();
+                            plugin.getDatabase()
-                            plugin.getRedisManager().sendUserDataUpdate(dataOwner, updatedUserData).join();
+                                    .setUserData(dataOwner, updatedUserData, DataSaveCause.INVENTORY_COMMAND)
+                                    .thenRun(() -> plugin.getRedisManager().sendUserDataUpdate(dataOwner, updatedUserData));
                         });
             });
         });

common/src/main/java/net/william278/husksync/util/Logger.java

@@ -11,7 +11,7 @@ public abstract class Logger {
 
     private boolean debug;
 
-    public abstract void log(@NotNull Level level, @NotNull String message, @NotNull Exception e);
+    public abstract void log(@NotNull Level level, @NotNull String message, @NotNull Throwable e);
 
     public abstract void log(@NotNull Level level, @NotNull String message);
 

common/src/test/java/net/william278/husksync/logger/DummyLogger.java

@@ -11,7 +11,7 @@ public class DummyLogger extends Logger {
     }
 
     @Override
-    public void log(@NotNull Level level, @NotNull String message, @NotNull Exception e) {
+    public void log(@NotNull Level level, @NotNull String message, @NotNull Throwable e) {
         System.out.println(level.getName() + ": " + message);
         e.printStackTrace();
     }