Only set the result if it has changed, Fix #1490

DenizenScript · Dec 7, 2016 · fa5aebc · fa5aebc
1 parent 95cbc46
commit fa5aebc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/events/player/ItemRecipeFormedScriptEvent.java b/plugin/src/main/java/net/aufdemrand/denizen/events/player/ItemRecipeFormedScriptEvent.java
@@ -50,6 +50,8 @@ public ItemRecipeFormedScriptEvent() {
     }
 
     public static ItemRecipeFormedScriptEvent instance;
+
+    public boolean resultChanged;
     public dItem result;
     public dList recipe;
     public CraftingInventory inventory;
@@ -67,11 +69,7 @@ public boolean matches(ScriptContainer scriptContainer, String s) {
         String lower = CoreUtilities.toLowerCase(s);
         String eItem = CoreUtilities.getXthArg(0, lower);
 
-        if (!tryItem(result, eItem)) {
-            return false;
-        }
-
-        return true;
+        return tryItem(result, eItem);
     }
 
     @Override
@@ -93,6 +91,7 @@ public void destroy() {
     public boolean applyDetermination(ScriptContainer container, String determination) {
         if (dItem.matches(determination)) {
             result = dItem.valueOf(determination);
+            resultChanged = true;
         }
 
         return super.applyDetermination(container, determination);
@@ -139,12 +138,13 @@ public void onRecipeFormed(PrepareItemCraftEvent event) {
             }
         }
         player = dEntity.getPlayerFrom(humanEntity);
+        resultChanged = false;
         cancelled = false;
         fire();
         if (cancelled) {
             inventory.setResult(null);
         }
-        else {
+        else if (resultChanged) {
             inventory.setResult(result.getItemStack());
         }
     }

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/ItemScriptHelper.java b/plugin/src/main/java/net/aufdemrand/denizen/scripts/containers/core/ItemScriptHelper.java
@@ -381,7 +381,7 @@ public void run() {
                             if (event.cancelled) {
                                 inventory.setResult(null);
                             }
-                            else {
+                            else if (event.resultChanged) {
                                 // If this was a valid match, set the crafting's result
                                 inventory.setResult(event.result.getItemStack());
                             }