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

Fixed the throwing dagger so that it only gives Will when the entity actually gets killed.

Browse source
This commit is contained in:
WayofTime 2021-01-25 10:22:42 -05:00
parent 1b06cea133
commit 66c1f2f4ac
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/wayoftime/bloodmagic/entity/projectile/EntityThrowingDagger.java
View file

@ -400,11 +400,6 @@ public class EntityThrowingDagger extends ProjectileItemEntity
{ {
((LivingEntity) entity1).setLastAttackedEntity(entity); ((LivingEntity) entity1).setLastAttackedEntity(entity);
} }
if (entity1 instanceof PlayerEntity && entity instanceof LivingEntity)
{
PlayerDemonWillHandler.addDemonWill(willType, (PlayerEntity) entity1, this.getWillDropForMobHealth(((LivingEntity) entity).getMaxHealth()));
}
} }
boolean flag = entity.getType() == EntityType.ENDERMAN; boolean flag = entity.getType() == EntityType.ENDERMAN;
@ -421,13 +416,18 @@ public class EntityThrowingDagger extends ProjectileItemEntity
return; return;
} }
if (!entity.isAlive() && entity1 instanceof PlayerEntity && entity instanceof LivingEntity)
{
PlayerDemonWillHandler.addDemonWill(willType, (PlayerEntity) entity1, this.getWillDropForMobHealth(((LivingEntity) entity).getMaxHealth()));
}
if (entity instanceof LivingEntity) if (entity instanceof LivingEntity)
{ {
LivingEntity livingentity = (LivingEntity) entity; LivingEntity livingentity = (LivingEntity) entity;
if (!this.world.isRemote && this.getPierceLevel() <= 0) // if (!this.world.isRemote && this.getPierceLevel() <= 0)
{ // {
livingentity.setArrowCountInEntity(livingentity.getArrowCountInEntity() + 1); // livingentity.setArrowCountInEntity(livingentity.getArrowCountInEntity() + 1);
} // }
if (this.knockbackStrength > 0) if (this.knockbackStrength > 0)
{ {