Skip to content

Commit 30b257f

Browse files
Various minor fixes,
Removal of the bundle workaround
1 parent 83544a8 commit 30b257f

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

src/main/java/com/nuclyon/technicallycoded/inventoryrollback/InventoryRollbackPlus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public void bStats() {
142142
Metrics metrics = new Metrics(this, 9437);
143143

144144
if (ConfigData.isbStatsEnabled())
145-
getLogger().info(MessageData.getPluginPrefix() + "bStats are enabled");
145+
getPluginLogger().info(MessageData.getPluginPrefix() + "bStats are enabled");
146146

147147
metrics.addCustomChart(new SimplePie("database_type", () -> ConfigData.getSaveType().getName()));
148148

src/main/java/me/danjono/inventoryrollback/config/MessageData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public boolean saveConfig() {
5252
}
5353

5454
private static String pluginPrefix;
55-
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.";
55+
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)";
5656
private static String noPermission;
5757
private static String error;
5858
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.";

src/main/java/me/danjono/inventoryrollback/inventory/SaveInventory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ public static String toBase64(ItemStack[] contents) {
124124

125125
for (ItemStack stack : contents) {
126126
// TODO: remove bundle error saving workaround
127-
if (stack != null && useBundleWorkaround && stack.getType().equals(Material.BUNDLE))
127+
/*if (stack != null && useBundleWorkaround && stack.getType().equals(Material.BUNDLE))
128128
{
129129
dataOutput.writeObject(null);
130130
continue;
131-
}
131+
}*/
132132
dataOutput.writeObject(stack);
133133
}
134134
dataOutput.close();

src/main/resources/plugin.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ permissions:
2626
inventoryrollbackplus.forcebackup: true
2727
inventoryrollbackplus.version: true
2828
inventoryrollbackplus.help: true
29+
inventoryrollbackplus.adminalerts: true
2930
default: op
3031
inventoryrollbackplus.cmd:
3132
description: Allows InventoryRollback commands to work.

0 commit comments

Comments
 (0)