From 1017a49c4182b03480bb149eb2cca64a552054d6 Mon Sep 17 00:00:00 2001 From: destro174 <40720638+destro174@users.noreply.github.com> Date: Mon, 14 Feb 2022 10:05:42 +0100 Subject: [PATCH] fix npe when mypet isn't loaded --- .../GriefPrevention/EntityEventHandler.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java index 2bc46e6..157cab0 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java @@ -1236,9 +1236,16 @@ public class EntityEventHandler implements Listener if (damageSource != null && damageSource.getType() == EntityType.FIREWORK && event.getEntity().getType() != EntityType.PLAYER) return; - if (sendErrorMessagesToPlayers && !(event.getEntity() instanceof MyPetBukkitEntity)) // don't send the error message if it's a mypet - { - GriefPrevention.sendMessage(attacker, TextMode.Err, noContainersReason.get()); + 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()); + } + } 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); }