From 80417b99e10a462fd72b8f8fcd3b226c862534e4 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Fri, 1 May 2015 21:37:34 +0100 Subject: - Fixed villages crashing on a server - Fixed item duplication glitch --- .../client/gui/container/ContainerJewelryTab.java | 55 +++++++++++++++------- 1 file changed, 38 insertions(+), 17 deletions(-) (limited to 'src/main/java/darkknight/jewelrycraft/client') diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java index 1b2ab60..3b323e6 100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java @@ -16,7 +16,6 @@ import darkknight.jewelrycraft.item.ItemRing; public class ContainerJewelryTab extends Container { - /** * @param player * @param inv @@ -68,23 +67,45 @@ public class ContainerJewelryTab extends Container if (slot != null && slot.getHasStack()){ ItemStack itemstack1 = slot.getStack(); itemstack = itemstack1.copy(); - if (slotID < 18){ - if (!mergeItemStack(itemstack1, 18, 18 + 36, true)) return null; - slot.onSlotChange(itemstack1, itemstack); - }else if (itemstack1.getItem() instanceof ItemRing){ - if (!mergeItemStack(itemstack1, 0, 10, false)) return null; - }else if (itemstack1.getItem() instanceof ItemBracelet){ - if (!mergeItemStack(itemstack1, 10, 14, false)) return null; - }else if (itemstack1.getItem() instanceof ItemNecklace){ - if (!mergeItemStack(itemstack1, 14, 17, false)) return null; - }else if (itemstack1.getItem() instanceof ItemEarrings){ - if (!mergeItemStack(itemstack1, 17, 18, false)) return null; - }else{ - if (!mergeItemStack(itemstack1, 18, 54, true)) return null; - slot.onSlotChange(itemstack1, itemstack); - } - if (itemstack1.stackSize == 0) slot.putStack((ItemStack)null); + // if (slotID < 18){ + // if (!mergeItemStack(itemstack1, 18, 54, true)) return null; + // slot.onSlotChange(itemstack1, itemstack); + // }else if (itemstack1.getItem() instanceof ItemRing){ + // if (!mergeItemStack(itemstack1, 0, 10, false)) return null; + // }else if (itemstack1.getItem() instanceof ItemBracelet){ + // if (!mergeItemStack(itemstack1, 10, 14, false)) return null; + // }else if (itemstack1.getItem() instanceof ItemNecklace){ + // if (!mergeItemStack(itemstack1, 14, 17, false)) return null; + // }else if (itemstack1.getItem() instanceof ItemEarrings){ + // if (!mergeItemStack(itemstack1, 17, 18, false)) return null; + // }else{ + // if (!mergeItemStack(itemstack1, 18, 54, true)) return null; + // slot.onSlotChange(itemstack1, itemstack); + // } + if (slotID >= 18){ + if (itemstack.getItem() instanceof ItemRing){ + if (!mergeItemStack(itemstack, 0, 10, false) && !slot.getHasStack()) return null; + }else if (itemstack.getItem() instanceof ItemBracelet){ + if (!mergeItemStack(itemstack, 10, 14, false) && !slot.getHasStack()) return null; + }else if (itemstack.getItem() instanceof ItemNecklace ){ + if (!mergeItemStack(itemstack, 14, 17, false) && !slot.getHasStack()) return null; + }else if (itemstack.getItem() instanceof ItemEarrings){ + if (!mergeItemStack(itemstack, 17, 18, false) && !slot.getHasStack()) return null; + } + else{ + if (slotID < 27){ + if (!mergeItemStack(itemstack, 27, 36 + 18, false)) return null; + }else{ + if (!mergeItemStack(itemstack, 18, 27, false)) return null; + } + } + }else if (!mergeItemStack(itemstack, 18, inventorySlots.size(), false)) return null; + if (itemstack.stackSize == 0) slot.putStack(null); else slot.onSlotChanged(); + if (itemstack.stackSize != itemstack.stackSize) slot.onPickupFromSlot(player, itemstack); + else return null; + // if (itemstack1.stackSize == 0) slot.putStack((ItemStack)null); + // else slot.onSlotChanged(); } return itemstack; } -- cgit v1.2.3