Also suppport old ProtocolLib

Leymooo · Jun 3, 2020 · 88943ff · 88943ff
1 parent bdfcd70
commit 88943ff
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/main/java/ru/leymooo/fixer/ItemChecker.java b/src/main/java/ru/leymooo/fixer/ItemChecker.java
@@ -338,7 +338,7 @@ private boolean isCrashItem(ItemStack stack, NbtCompound tag, Material mat) {
             return true;
         }
         int tagL = tag.toString().length();
-        if (hasLongArrayTag(tag)) {
+        if (plugin.isLongArraysSupported() && hasLongArrayTag(tag)) {
             return true;
         }
         if ((mat == Material.NAME_TAG || tiles.contains(mat)) && tagL > 600) {

diff --git a/src/main/java/ru/leymooo/fixer/Main.java b/src/main/java/ru/leymooo/fixer/Main.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 
+import com.comphenix.protocol.wrappers.nbt.NbtType;
 import me.catcoder.updatechecker.PluginUpdater;
 import me.catcoder.updatechecker.UpdaterException;
 import me.catcoder.updatechecker.UpdaterResult;
@@ -24,6 +25,7 @@ public class Main extends JavaPlugin {
     private MagicAPI mapi;
     private ItemChecker checker;
     private ProtocolManager manager;
+    private boolean longArraysSupported;
     private final PluginUpdater updater = new PluginUpdater(this, "Dimatert9", "ItemFixer");
 
     @Override
@@ -33,7 +35,7 @@ public void onEnable() {
             setEnabled(false);
             return;
         }
-
+        checkLongArraySupport();
         saveDefaultConfig();
         checkNewConfig();
         PluginManager pmanager = Bukkit.getPluginManager();
@@ -105,4 +107,15 @@ private void checkUpdate() {
             }
         }).start();
     }
+
+    private void checkLongArraySupport() {
+        try {
+            NbtType type = NbtType.TAG_LONG_ARRAY;
+            this.longArraysSupported = NbtType.valueOf("TAG_LONG_ARRAY") != null || type != null;
+        } catch (Throwable e) {}
+    }
+
+    public boolean isLongArraysSupported() {
+        return longArraysSupported;
+    }
 }