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

Fixed bowls of water being hideous because they weren't going into the main hand

Browse source
This commit is contained in:
Ellpeck 2016-07-20 22:31:27 +02:00
parent 4bf0fce0d2
commit a0f66373b6
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,6 +42,7 @@ public class ItemWaterBowl extends ItemBase{
@SubscribeEvent @SubscribeEvent
public void onPlayerInteractEvent(PlayerInteractEvent event){ public void onPlayerInteractEvent(PlayerInteractEvent event){
System.out.println("ACTIVE");
if(event.getWorld() != null){ if(event.getWorld() != null){
if(ConfigBoolValues.WATER_BOWL.isEnabled()){ if(ConfigBoolValues.WATER_BOWL.isEnabled()){
if(event.getItemStack() != null && event.getItemStack().getItem() == Items.BOWL){ if(event.getItemStack() != null && event.getItemStack().getItem() == Items.BOWL){
@ -60,7 +61,10 @@ public class ItemWaterBowl extends ItemBase{
event.getItemStack().stackSize--; event.getItemStack().stackSize--;
ItemStack bowl = new ItemStack(InitItems.itemWaterBowl); ItemStack bowl = new ItemStack(InitItems.itemWaterBowl);
if(!event.getEntityPlayer().inventory.addItemStackToInventory(bowl.copy())){ if(event.getItemStack().stackSize <= 0){
event.getEntityPlayer().setHeldItem(event.getHand(), bowl);
}
else if(!event.getEntityPlayer().inventory.addItemStackToInventory(bowl.copy())){
EntityItem entityItem = new EntityItem(event.getWorld(), event.getEntityPlayer().posX, event.getEntityPlayer().posY, event.getEntityPlayer().posZ, bowl.copy()); EntityItem entityItem = new EntityItem(event.getWorld(), event.getEntityPlayer().posX, event.getEntityPlayer().posY, event.getEntityPlayer().posZ, bowl.copy());
entityItem.setPickupDelay(0); entityItem.setPickupDelay(0);
event.getWorld().spawnEntityInWorld(entityItem); event.getWorld().spawnEntityInWorld(entityItem);