Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 00:38:35 +01:00
Code Issues Projects Releases Wiki Activity

Closes #1061

Browse source
This commit is contained in:
Shadows_of_Fire 2018-04-13 13:19:52 -04:00
parent 981a0c6ae1
commit b91bde4d74
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemWaterBowl.java
View file

@ -139,7 +139,7 @@ public class ItemWaterBowl extends ItemBase{
if(entity instanceof EntityPlayer){ if(entity instanceof EntityPlayer){
EntityPlayer player = (EntityPlayer)entity; EntityPlayer player = (EntityPlayer)entity;
if(this.tryPlaceContainedLiquid(player, world, player.getPosition(), true)){ if(this.tryPlaceContainedLiquid(player, world, player.getPosition(), true)){
player.inventory.setInventorySlotContents(itemSlot, new ItemStack(Items.BOWL)); checkReplace(player, stack, new ItemStack(Items.BOWL), itemSlot);
} }
} }
} }
@ -160,6 +160,11 @@ public class ItemWaterBowl extends ItemBase{
} }
} }
private void checkReplace(EntityPlayer player, ItemStack old, ItemStack stack, int slot) {
if(player.inventory.getStackInSlot(slot) == old) player.inventory.setInventorySlotContents(slot, stack);
else if(player.inventory.offHandInventory.get(slot) == old) player.inventory.offHandInventory.set(slot, stack);
}
@Override @Override
public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged){ public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged){
return !ItemStack.areItemsEqual(oldStack, newStack); return !ItemStack.areItemsEqual(oldStack, newStack);