fix grindstone event determination casing

DenizenScript · Jan 26, 2023 · 30fcb48 · 30fcb48
1 parent c6212e4
commit 30fcb48
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/...java/com/denizenscript/denizen/paper/events/PlayerPreparesGrindstoneCraftScriptEvent.java b/...java/com/denizenscript/denizen/paper/events/PlayerPreparesGrindstoneCraftScriptEvent.java
@@ -67,9 +67,10 @@ public boolean matches(ScriptPath path) {
     @Override
     public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
         if (determinationObj instanceof ElementTag) {
-            String lower = CoreUtilities.toLowerCase(determinationObj.toString());
+            String determination = determinationObj.toString();
+            String lower = CoreUtilities.toLowerCase(determination);
             if (lower.startsWith("result:")) {
-                ItemTag result = ItemTag.valueOf(lower.substring("result:".length()), path.container);
+                ItemTag result = ItemTag.valueOf(determination.substring("result:".length()), path.container);
                 event.setResult(result.getItemStack());
                 return true;
             }
@@ -79,11 +80,11 @@ public boolean applyDetermination(ScriptPath path, ObjectTag determinationObj) {
 
     @Override
     public ObjectTag getContext(String name) {
-        switch (name) {
-            case "inventory": return InventoryTag.mirrorBukkitInventory(event.getInventory());
-            case "result": return new ItemTag(event.getResult());
-        }
-        return super.getContext(name);
+        return switch (name) {
+            case "inventory" -> InventoryTag.mirrorBukkitInventory(event.getInventory());
+            case "result" -> new ItemTag(event.getResult());
+            default -> super.getContext(name);
+        };
     }
 
     @Override

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTargetsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTargetsScriptEvent.java
@@ -24,7 +24,7 @@ public class EntityTargetsScriptEvent extends BukkitScriptEvent implements Liste
     //
     // @Cancellable true
     //
-    // @Triggers when an entity targets a new entity.
+    // @Triggers when an entity targets a new entity - usually a hostile mob preparing to attack something.
     //
     // @Context
     // <context.entity> returns the targeting entity.
@@ -84,16 +84,12 @@ public ScriptEntryData getScriptEntryData() {
 
     @Override
     public ObjectTag getContext(String name) {
-        if (name.equals("entity")) {
-            return entity.getDenizenObject();
-        }
-        else if (name.equals("reason")) {
-            return reason;
-        }
-        else if (name.equals("target") && target != null) {
-            return target.getDenizenObject();
-        }
-        return super.getContext(name);
+        return switch (name) {
+            case "entity" -> entity.getDenizenObject();
+            case "reason" -> reason;
+            case "target" -> target == null ? null : target.getDenizenObject();
+            default -> super.getContext(name);
+        };
     }
 
     @EventHandler