From df6914fb1e526c7433c3cfc8d2996214d1d6fbb5 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Thu, 21 Jun 2018 07:48:45 +1000 Subject: [PATCH] possible fix for mob damage --- .../java/com/plotsquared/bukkit/listeners/PlayerEvents.java | 2 +- .../java/com/intellectualcrafters/plot/object/PlotArea.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java index a57c5f924..cfb4a022e 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java @@ -2515,7 +2515,7 @@ public class PlayerEvents extends PlotListener implements Listener { return false; } // player is null - return !(damager instanceof Arrow && !(victim instanceof Creature)); + return (dArea != null && dArea.MOB_DAMAGE) || !(damager instanceof Arrow && !(victim instanceof Creature)); } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotArea.java b/Core/src/main/java/com/intellectualcrafters/plot/object/PlotArea.java index 33bd9385d..2e85329d1 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotArea.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/object/PlotArea.java @@ -52,6 +52,7 @@ public abstract class PlotArea { public boolean MISC_SPAWN_UNOWNED = false; public boolean MOB_SPAWNING = false; public boolean MOB_SPAWNER_SPAWNING = false; + public boolean MOB_DAMAGE = false; public String PLOT_BIOME = "FOREST"; public boolean PLOT_CHAT = false; public boolean SCHEMATIC_CLAIM_SPECIFY = false; @@ -217,6 +218,7 @@ public abstract class PlotArea { this.TERRAIN = config.getInt("generator.terrain"); this.TYPE = config.getInt("generator.type"); } + this.MOB_DAMAGE = config.getBoolean("mob_damage"); this.MOB_SPAWNING = config.getBoolean("natural_mob_spawning"); this.MISC_SPAWN_UNOWNED = config.getBoolean("misc_spawn_unowned"); this.MOB_SPAWNER_SPAWNING = config.getBoolean("mob_spawner_spawning"); @@ -326,6 +328,7 @@ public abstract class PlotArea { */ public void saveConfiguration(ConfigurationSection config) { HashMap options = new HashMap<>(); + options.put("mob_damage", this.MOB_DAMAGE); options.put("natural_mob_spawning", this.MOB_SPAWNING); options.put("misc_spawn_unowned", this.MISC_SPAWN_UNOWNED); options.put("mob_spawner_spawning", this.MOB_SPAWNER_SPAWNING);