Merge pull request #33 from leumasme/master

Fix crash with CombatHotbar

Author: Dream-Master

src/main/java/shukaro/warptheory/handlers/warpevents/WarpInventoryScramble.java

@@ -18,6 +18,12 @@ public WarpInventoryScramble(int minWarp) {
         super("inventoryscramble", minWarp);
     }
 
+    @Override
+    public boolean canDo(World world, EntityPlayer player) {
+        // Combat Hotbar slots are not in the main inventory.
+        return player.inventory.currentItem < player.inventory.mainInventory.length;
+    }
+
     @Override
     public boolean doEvent(World world, EntityPlayer player) {
         if (world.isRemote) return true;

src/main/java/shukaro/warptheory/handlers/warpevents/WarpInventorySwap.java

@@ -33,7 +33,8 @@ public boolean doEvent(World world, EntityPlayer player) {
             }
         }
 
-        boolean canSwapHandItem = player.inventory.getCurrentItem() != null && !emptySlots.isEmpty();
+        boolean canSwapHandItem = player.inventory.getCurrentItem() != null && !emptySlots.isEmpty()
+                && player.inventory.currentItem < player.inventory.mainInventory.length;
         boolean canSwapInventory = !fullSlots.isEmpty();
         if (canSwapHandItem && canSwapInventory) {
             // Pick one of the two to do.