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

Late git push is late

Browse source
This commit is contained in:
WayofTime 2014-04-01 20:29:02 -04:00
parent b962ede72d
commit a1ca81423b
9 changed files with 62 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
BM_src/WayofTime/alchemicalWizardry/common/items/EnergyItems.java
View file

@ -60,9 +60,10 @@ public class EnergyItems extends Item implements IBindable
//player.setEntityHealth((player.getHealth()-1));
player.setHealth((player.getHealth() - 1));
if (player.getHealth() <= 0)
if (player.getHealth() <= 0.0005)
{
player.inventory.dropAllItems();
break;
}
}
}
@ -217,9 +218,10 @@ public class EnergyItems extends Item implements IBindable
//player.setEntityHealth((player.getHealth()-1));
user.setHealth((user.getHealth() - 1));
if (user.getHealth() <= 0.1f)
if (user.getHealth() <= 0.0005f)
{
user.onDeath(DamageSource.generic);
}
}
} else if (energySyphoned >= 100)
@ -231,9 +233,10 @@ public class EnergyItems extends Item implements IBindable
//player.setEntityHealth((player.getHealth()-1));
user.setHealth((user.getHealth() - 1));
if (user.getHealth() <= 0.1f)
if (user.getHealth() <= 0.0005f)
{
user.onDeath(DamageSource.generic);
break;
}
}
}

2
BM_src/WayofTime/alchemicalWizardry/common/items/sigil/ItemBloodLightSigil.java
View file

@ -117,7 +117,7 @@ public class ItemBloodLightSigil extends EnergyItems
if (!par2World.isRemote)
{
par2World.spawnEntityInWorld(new EntityBloodLightProjectile(par2World, par3EntityPlayer, 10));
par2World.spawnEntityInWorld(new EntityBloodLightProjectile(par2World, par3EntityPlayer, 1));
}
return par1ItemStack;