diff options
| author | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-05-07 14:32:45 +0100 |
|---|---|---|
| committer | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-05-07 14:32:45 +0100 |
| commit | 2342897a409d08e2431b66191c4a7c4491e5222d (patch) | |
| tree | 2d4cb5dbae8b95bd4f542e003be5621d47b3e870 /src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java | |
| parent | 74fbeb38e032b25fc278810d2d3df0f0ed0234ef (diff) | |
Refined the Interface a bit more
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java')
| -rw-r--r-- | src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java index dc13b09..14f74cd 100644 --- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java @@ -121,7 +121,7 @@ public class EntityEventHandler ItemStack item = ItemStack.loadItemStackFromNBT(nbt); if (item != null){ if(item.getItem() instanceof ItemBaseJewelry)((ItemBaseJewelry)item.getItem()).action(item, player); - if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onWearAction(player); + if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onWearAction(item, player); } } if (!player.worldObj.isRemote){ @@ -192,7 +192,7 @@ public class EntityEventHandler } if (item != null){ if(item.getItem() instanceof ItemBaseJewelry)((ItemBaseJewelry)item.getItem()).onPlayerAttacked(item, player, event.source, event.ammount); - if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onPlayerAttackedAction(player, event.source, event.ammount); + if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onPlayerAttackedAction(item, player, event.source, event.ammount); } } if (player.getHealth() != player.prevHealth){ @@ -253,7 +253,7 @@ public class EntityEventHandler } if (item != null){ if(item.getItem() instanceof ItemBaseJewelry)((ItemBaseJewelry)item.getItem()).onEntityAttacked(item, player, entity, event.ammount); - if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onEntityAttackedByPlayer(player, entity, event.ammount); + if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onEntityAttackedByPlayer(item, player, entity, event.ammount); } } for(Curse curse: Curse.getCurseList()) @@ -290,7 +290,7 @@ public class EntityEventHandler ItemStack item = ItemStack.loadItemStackFromNBT(nbt); if (item != null){ if(item.getItem() instanceof ItemBaseJewelry)((ItemBaseJewelry)item.getItem()).onPlayerRespawn(item, event); - if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onPlayerRespawnAction(event); + if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onPlayerRespawnAction(item, event); } } } @@ -404,7 +404,7 @@ public class EntityEventHandler ItemStack item = ItemStack.loadItemStackFromNBT(nbt); if (item != null){ if(item.getItem() instanceof ItemBaseJewelry)((ItemBaseJewelry)item.getItem()).onPlayerDead(item, player, event.source); - if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onPlayerDeadAction(player, event.source); + if(item.getItem() instanceof IJewelryItem)((IJewelryItem)item.getItem()).onPlayerDeadAction(item, player, event.source); } } } |