From 73ba6fb608b5857ba407ad98a48372a0626bcb35 Mon Sep 17 00:00:00 2001 From: DroppingAnvil Date: Fri, 1 Nov 2019 15:17:24 -0500 Subject: [PATCH] Various bug fixes. Thanks to Akraos for helping debug! If you would like to regenerate your conf.json it adds an option to turn off the creeper glitch prevention. Signed-off-by: DroppingAnvil --- src/main/java/com/massivecraft/factions/Conf.java | 1 + .../factions/listeners/FactionsEntityListener.java | 3 +++ src/main/resources/plugin.yml | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java index 3f2a4415..43e702bf 100644 --- a/src/main/java/com/massivecraft/factions/Conf.java +++ b/src/main/java/com/massivecraft/factions/Conf.java @@ -114,6 +114,7 @@ public class Conf { public static boolean logMoneyTransactions = true; public static boolean logPlayerCommands = true; // prevent some potential exploits + public static boolean preventCreeperGlitch = true; public static boolean handleExploitObsidianGenerators = true; public static boolean handleExploitEnderPearlClipping = true; public static boolean handleExploitInteractionSpam = true; diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java index ca98b4a7..765a5007 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java @@ -34,6 +34,9 @@ public class FactionsEntityListener implements Listener { @EventHandler public void onCreeperGlitch(EntityDamageEvent e) { + if (!Conf.preventCreeperGlitch) { + return; + } if (!e.getEntity().getType().equals(EntityType.CREEPER)) { return; } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 4fb8f401..42a08777 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -66,12 +66,13 @@ permissions: description: Can do all but create factions. children: factions.missions: true + factions.tntfill: true factions.shop: true factions.permissions: true factions.setdiscord: true factions.discord: true factions.paypal: true - factions.paypalset: true + factions.setpaypal: true factions.admin: true factions.autoclaim: true factions.promote: true