Move the BEFORE COmmandItem actions to prevent it using consumables w…

…hen it shouldn;'t.
EngineHub · Jan 29, 2017 · c75fe9f · c75fe9f
1 parent 9c0d14d
commit c75fe9f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/com/sk89q/craftbook/mechanics/items/CommandItems.java b/src/main/java/com/sk89q/craftbook/mechanics/items/CommandItems.java
@@ -433,6 +433,11 @@ public void performCommandItems(ItemStack item, final Player player, final Event
                     }
                 }
 
+                for(CommandItemAction action : comdef.actions)
+                    if(action.stage == ActionRunStage.BEFORE)
+                        if(!action.runAction(comdef, event, player))
+                            break current;
+
                 for(ItemStack stack : def.consumables) {
 
                     boolean found = false;
@@ -483,11 +488,6 @@ public void performCommandItems(ItemStack item, final Player player, final Event
 
                 player.updateInventory();
 
-                for(CommandItemAction action : comdef.actions)
-                    if(action.stage == ActionRunStage.BEFORE)
-                        if(!action.runAction(comdef, event, player))
-                            break current;
-
                 for(String command : comdef.commands)
                     doCommand(command, event, comdef, player);