lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More work on the implementation of events

Browse source
This commit is contained in:
WayofTime 2014-11-07 13:45:02 -05:00
parent dd3a093825
commit 39b4243a82
27 changed files with 217 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java
View file

@ -85,7 +85,10 @@ public class EnergyBazooka extends EnergyItems
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
this.syphonBatteries(par1ItemStack, par3EntityPlayer, this.getEnergyUsed());
if(!this.syphonBatteries(par1ItemStack, par3EntityPlayer, this.getEnergyUsed()))
{
return par1ItemStack;
}
}
par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
@ -131,7 +134,10 @@ public class EnergyBazooka extends EnergyItems
{
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 50);
if(!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 50))
{
this.setActivated(par1ItemStack, false);
}
}
}