fix npe when mypet isn't loaded
This commit is contained in:
parent
f471a4ea72
commit
1017a49c41
|
|
@ -1236,9 +1236,16 @@ public class EntityEventHandler implements Listener
|
||||||
if (damageSource != null && damageSource.getType() == EntityType.FIREWORK && event.getEntity().getType() != EntityType.PLAYER)
|
if (damageSource != null && damageSource.getType() == EntityType.FIREWORK && event.getEntity().getType() != EntityType.PLAYER)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (sendErrorMessagesToPlayers && !(event.getEntity() instanceof MyPetBukkitEntity)) // don't send the error message if it's a mypet
|
try {
|
||||||
{
|
if (sendErrorMessagesToPlayers && !(event.getEntity() instanceof MyPetBukkitEntity)) // don't send the error message if it's a mypet
|
||||||
GriefPrevention.sendMessage(attacker, TextMode.Err, noContainersReason.get());
|
{
|
||||||
|
GriefPrevention.sendMessage(attacker, TextMode.Err, noContainersReason.get());
|
||||||
|
}
|
||||||
|
} catch (NoClassDefFoundError ex) {
|
||||||
|
if (sendErrorMessagesToPlayers) // don't send the error message if it's a mypet
|
||||||
|
{
|
||||||
|
GriefPrevention.sendMessage(attacker, TextMode.Err, noContainersReason.get());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user