From 9020d740d17c6f32cccf4280dc4f63212daf2d10 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Sat, 23 Jun 2018 11:46:19 +1000 Subject: [PATCH] Revert "possible fix for mob damage" This reverts commit df6914fb1e526c7433c3cfc8d2996214d1d6fbb5. --- .../java/com/plotsquared/bukkit/listeners/PlayerEvents.java | 2 +- .../java/com/intellectualcrafters/plot/object/PlotArea.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) 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 cfb4a022e..a57c5f924 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 (dArea != null && dArea.MOB_DAMAGE) || !(damager instanceof Arrow && !(victim instanceof Creature)); + return !(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 2e85329d1..33bd9385d 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/object/PlotArea.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/object/PlotArea.java @@ -52,7 +52,6 @@ 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; @@ -218,7 +217,6 @@ 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"); @@ -328,7 +326,6 @@ 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);