Various minor fixes,

Removal of the bundle workaround
TechnicallyCoded · Aug 18, 2021 · 30b257f · 30b257f
1 parent 83544a8
commit 30b257f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/com/nuclyon/technicallycoded/inventoryrollback/InventoryRollbackPlus.java b/src/main/java/com/nuclyon/technicallycoded/inventoryrollback/InventoryRollbackPlus.java
@@ -142,7 +142,7 @@ public void bStats() {
         Metrics metrics = new Metrics(this,  	9437);
 
         if (ConfigData.isbStatsEnabled())
-            getLogger().info(MessageData.getPluginPrefix() + "bStats are enabled");
+            getPluginLogger().info(MessageData.getPluginPrefix() + "bStats are enabled");
 
         metrics.addCustomChart(new SimplePie("database_type", () -> ConfigData.getSaveType().getName()));
 

diff --git a/src/main/java/me/danjono/inventoryrollback/config/MessageData.java b/src/main/java/me/danjono/inventoryrollback/config/MessageData.java
@@ -52,7 +52,7 @@ public boolean saveConfig() {
     }
 
     private static String pluginPrefix;
-    private static String adminAlerts = ChatColor.RED + "Admin alert: Bundles in 1.17.x are not saved in backups due to this item being incompatible with the current version of spigot.";
+    private static String adminAlerts = ChatColor.RED + "Admin Only Alert: If bundles in 1.17 are causing errors when saved in backups please update your server to a newer release of the server software you are using. This issue was corrected in a recent patch of spigot and has already made it's way to paper (and probably most forks of paper)";
     private static String noPermission;
     private static String error;
     private static String errorInventory = "You cannot access this backup due to an error. The backup was likely generated on another Minecraft server version and a Material ID has now changed.";

diff --git a/src/main/java/me/danjono/inventoryrollback/inventory/SaveInventory.java b/src/main/java/me/danjono/inventoryrollback/inventory/SaveInventory.java
@@ -124,11 +124,11 @@ public static String toBase64(ItemStack[] contents) {
 
                 for (ItemStack stack : contents) {
                     // TODO: remove bundle error saving workaround
-                    if (stack != null && useBundleWorkaround && stack.getType().equals(Material.BUNDLE))
+                    /*if (stack != null && useBundleWorkaround && stack.getType().equals(Material.BUNDLE))
                     {
                         dataOutput.writeObject(null);
                         continue;
-                    }
+                    }*/
                     dataOutput.writeObject(stack);
                 }
                 dataOutput.close();

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -26,6 +26,7 @@ permissions:
       inventoryrollbackplus.forcebackup: true
       inventoryrollbackplus.version: true
       inventoryrollbackplus.help: true
+      inventoryrollbackplus.adminalerts: true
     default: op
   inventoryrollbackplus.cmd:
     description: Allows InventoryRollback commands to work.