mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 10:55:17 +00:00
Weapons created by the Key of the King's Law now despawn properly on death. Also buffed its damage a bit.
This commit is contained in:
1 parent
4490f3d8cf
commit
1fcdc82741
1 file changed
+3
-3
@@ -65,7 +65,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy {
|
||||
@Override
|
||||
public void onUpdate() {
|
||||
EntityLivingBase thrower = getThrower();
|
||||
if(!worldObj.isRemote && (thrower == null || !(thrower instanceof EntityPlayer))) {
|
||||
if(!worldObj.isRemote && (thrower == null || !(thrower instanceof EntityPlayer) || thrower.isDead)) {
|
||||
setDead();
|
||||
return;
|
||||
}
|
||||
@@ -129,8 +129,8 @@ public class EntityBabylonWeapon extends EntityThrowableCopy {
|
||||
|
||||
if(living.hurtTime == 0) {
|
||||
if(player != null)
|
||||
living.attackEntityFrom(DamageSource.causePlayerDamage(player), 14);
|
||||
else living.attackEntityFrom(DamageSource.generic, 14);
|
||||
living.attackEntityFrom(DamageSource.causePlayerDamage(player), 20);
|
||||
else living.attackEntityFrom(DamageSource.generic, 20);
|
||||
onImpact(new MovingObjectPosition(living));
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user