diff options
| author | bculkin2442 <bjculkin@mix.wvu.edu> | 2019-09-04 22:24:39 -0400 |
|---|---|---|
| committer | bculkin2442 <bjculkin@mix.wvu.edu> | 2019-09-04 22:24:39 -0400 |
| commit | cdbbd891c43e082a36a32e49420bf87b6edd28e0 (patch) | |
| tree | c3a970f6cc05a74e3c1fec6c670a07055e21c01d /src/main/java/darkknight/jewelrycraft/client | |
| parent | 857d548f591b8f3770befd2535985959fd870474 (diff) | |
More affix work
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/client')
| -rwxr-xr-x | src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java | 11 |
1 files changed, 6 insertions, 5 deletions
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 6a118dc..344df7e 100755 --- a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java @@ -46,14 +46,15 @@ public class ContainerJewelryTab extends Container { if (slotID >= 0 && slotID <= 17 && !player.worldObj.isRemote) {
try {
if (player.inventory.getItemStack() == null && inventoryItemStacks.get(slotID) != null
- && ((ItemStack) inventoryItemStacks.get(slotID)).getItem() instanceof ItemBaseJewelry)
+ && ((ItemStack) inventoryItemStacks.get(slotID)).getItem() instanceof ItemBaseJewelry) {
((ItemBaseJewelry) ((ItemStack) inventoryItemStacks.get(slotID)).getItem())
- .onJewelryUnequipped((ItemStack) inventoryItemStacks.get(slotID));
- else if (player.inventory.getItemStack() != null
+ .onJewelryUnequipped((ItemStack) inventoryItemStacks.get(slotID), player);
+ } else if (player.inventory.getItemStack() != null
&& player.inventory.getItemStack().getItem() instanceof ItemBaseJewelry
- && inventoryItemStacks.get(slotID) == null)
+ && inventoryItemStacks.get(slotID) == null) {
((ItemBaseJewelry) player.inventory.getItemStack().getItem())
- .onJewelryEquipped(player.inventory.getItemStack());
+ .onJewelryEquipped(player.inventory.getItemStack(), player);
+ }
if (player.inventory.getItemStack() == null && inventoryItemStacks.get(slotID) != null
&& ((ItemStack) inventoryItemStacks.get(slotID)).getItem() instanceof IJewelryItem)
((IJewelryItem) ((ItemStack) inventoryItemStacks.get(slotID)).getItem())
|