From 1f225d14f83523c9dbdd430be080346835d31843 Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Fri, 21 Aug 2020 02:59:20 +0200 Subject: [PATCH] added missing protection --- .../unspecific/LavaDumpAndIgniteListener.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/eu/endermite/togglepvp/listeners/unspecific/LavaDumpAndIgniteListener.java b/src/main/java/eu/endermite/togglepvp/listeners/unspecific/LavaDumpAndIgniteListener.java index 9d617a2..4475aa1 100644 --- a/src/main/java/eu/endermite/togglepvp/listeners/unspecific/LavaDumpAndIgniteListener.java +++ b/src/main/java/eu/endermite/togglepvp/listeners/unspecific/LavaDumpAndIgniteListener.java @@ -105,6 +105,25 @@ public class LavaDumpAndIgniteListener implements Listener { return; } } + } else if (entity instanceof Wolf) { + Wolf victim = (Wolf) entity; + if (victim.getOwner() == null) { + return; + } + boolean damagerPvpEnabled = TogglePvP.getPlugin().getPlayerManager().getPlayerPvPState(damager.getUniqueId()); + if (!damagerPvpEnabled) { + PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_attacker()); + event.setCancelled(true); + return; + } + try { + boolean victimPvpEnabled = (boolean) SmartCache.getPlayerData(victim.getOwner().getUniqueId()).get("pvpenabled"); + if (!victimPvpEnabled) { + PluginMessages.sendActionBar(damager, config.getCannot_attack_pets_victim()); + event.setCancelled(true); + return; + } + } catch (NullPointerException ignored) {} } } }