Reset event variables properly

Probably fixes #1339
DenizenScript · Mar 12, 2016 · 6947427 · 6947427
1 parent 24cb66a
commit 6947427
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerCraftsItemScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerCraftsItemScriptEvent.java
@@ -139,6 +139,7 @@ public void onCraftItem(CraftItemEvent event) {
             }
         }
         this.player = dEntity.getPlayerFrom(humanEntity);
+        this.resultChanged = false;
         fire();
         if (cancelled) {
             event.setCancelled(true);

diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerPicksUpScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerPicksUpScriptEvent.java
@@ -135,6 +135,7 @@ public void onPlayerPicksUp(PlayerPickupItemEvent event) {
         item = new dItem(itemEntity.getItemStack());
         entity = new dEntity(itemEntity);
         cancelled = event.isCancelled();
+        itemChanged = false;
         this.event = event;
         fire();
         if (itemChanged) {

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/ItemScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/ItemScriptHelper.java
@@ -216,6 +216,7 @@ public void specialRecipeClick(InventoryClickEvent event) {
                 }
                 scriptEvent.recipe = recipeList;
                 scriptEvent.player = dPlayer.mirrorBukkitPlayer(player);
+                scriptEvent.resultChanged = false;
                 scriptEvent.fire();
                 if (scriptEvent.cancelled) {
                     event.setCancelled(true);