enchantment scripts: don't allow vanilla level generation usage

DenizenScript · Oct 5, 2021 · 61c70b8 · 61c70b8
1 parent 0961207
commit 61c70b8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/AnnounceCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/AnnounceCommand.java
@@ -95,6 +95,9 @@ else if (!scriptEntry.hasObject("format")
             else if (!scriptEntry.hasObject("text")) {
                 scriptEntry.addObject("text", new ElementTag(arg.getRawValue()));
             }
+            else {
+                arg.reportUnhandled();
+            }
         }
         if (!scriptEntry.hasObject("text")) {
             throw new InvalidArgumentsException("Missing text argument!");

diff --git a/...in/java/com/denizenscript/denizen/scripts/containers/core/EnchantmentScriptContainer.java b/...in/java/com/denizenscript/denizen/scripts/containers/core/EnchantmentScriptContainer.java
@@ -254,6 +254,9 @@ public String autoTagForLevel(String value, int level) {
     }
 
     public boolean canEnchant(ItemStack item) {
+        if (!Bukkit.isPrimaryThread()) {
+            return false;
+        }
         ContextSource.SimpleMap src = new ContextSource.SimpleMap();
         src.contexts = new HashMap<>();
         src.contexts.put("item", new ItemTag(item));
@@ -262,6 +265,9 @@ public boolean canEnchant(ItemStack item) {
     }
 
     public boolean isCompatible(Enchantment enchantment) {
+        if (!Bukkit.isPrimaryThread()) {
+            return false; // NMS calls this method off-thread for level gen (mob equipment can have random enchants). Just say no to this for now.
+        }
         ContextSource.SimpleMap src = new ContextSource.SimpleMap();
         src.contexts = new HashMap<>();
         src.contexts.put("enchantment_key", new ElementTag(enchantment.getKey().toString()));