Resolves #661

pahimar · Mar 27, 2014 · 065d129 · 065d129 · Lapiman · Mar 27, 2014
1 parent ea280ba
commit 065d129
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java b/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java
@@ -172,15 +172,15 @@ public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex)
             else if (itemStack.getItem() instanceof ItemAlchemicalBag)
             {
                 // Attempt to shift click a bag from the player inventory into the hot bar inventory
-                if (slotIndex < (bagInventoryRows * bagInventoryColumns) + 27)
+                if (slotIndex < (bagInventoryRows * bagInventoryColumns) + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS))
                 {
-                    if (!this.mergeItemStack(itemStack, bagInventoryRows * bagInventoryColumns + 27, inventorySlots.size(), false))
+                    if (!this.mergeItemStack(itemStack, (bagInventoryRows * bagInventoryColumns) + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS), inventorySlots.size(), false))
                     {
                         return null;
                     }
                 }
                 // Attempt to shift click a bag from the hot bar inventory into the player inventory
-                else if (!this.mergeItemStack(itemStack, bagInventoryRows * bagInventoryColumns, (bagInventoryRows * bagInventoryColumns) + 27, false))
+                else if (!this.mergeItemStack(itemStack, bagInventoryRows * bagInventoryColumns, (bagInventoryRows * bagInventoryColumns) + (PLAYER_INVENTORY_ROWS * PLAYER_INVENTORY_COLUMNS), false))
                 {
                     return null;
                 }

diff --git a/version.xml b/version.xml
@@ -9,5 +9,5 @@
     <entry key="Minecraft 1.4.7">pre1f|http://goo.gl/Ria2V</entry>
     <entry key="Minecraft 1.5.1">pre1g|http://goo.gl/Ria2V</entry>
     <entry key="Minecraft 1.5.2">pre1h|http://goo.gl/Ria2V</entry>
-    <entry key="Minecraft 1.6.4">0.1.137|http://goo.gl/Ria2V</entry>
+    <entry key="Minecraft 1.6.4">0.1.140|http://goo.gl/Ria2V</entry>
 </properties>