Anvilcraft/aether-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Added a null check, this might fix a crash with inebriation.

Browse source
This commit is contained in:
bconlon 2020-12-05 21:57:50 -08:00
parent a5ac7685d2
commit 1f59f81489
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/com/gildedgames/the_aether/entities/effects/PotionInebriation.java
View file

@ -43,22 +43,24 @@ public class PotionInebriation extends Potion
@Override
public void performEffect(EntityLivingBase entityLivingBaseIn, int amplifier)
{
this.distractEntity(entityLivingBaseIn);
if (this.duration % 50 == 0)
if (entityLivingBaseIn != null)
{
entityLivingBaseIn.attackEntityFrom(new DamageSource("inebriation"), 1.0F);
}
this.distractEntity(entityLivingBaseIn);
if (entityLivingBaseIn instanceof EntityPlayer)
{
if (this.duration >= 500)
if (this.duration % 50 == 0)
{
((PlayerAether) AetherAPI.get((EntityPlayer) entityLivingBaseIn)).setPoisoned();
AetherNetwork.sendToAll(new PacketSendPoison((EntityPlayer) entityLivingBaseIn));
entityLivingBaseIn.attackEntityFrom(new DamageSource("inebriation"), 1.0F);
}
if (entityLivingBaseIn instanceof EntityPlayer)
{
if (this.duration >= 500)
{
((PlayerAether) AetherAPI.get((EntityPlayer) entityLivingBaseIn)).setPoisoned();
AetherNetwork.sendToAll(new PacketSendPoison((EntityPlayer) entityLivingBaseIn));
}
}
}
}
public void distractEntity(EntityLivingBase entityLivingBaseIn)