diff --git a/patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch index f848d03f5..327f5ec9b 100644 --- a/patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0130-Add-mobGriefing-bypass-to-everything-affected.patch @@ -179,24 +179,40 @@ index 262dff21467fa6dc79126a96575a8fe9c49b9116..e5b8e09bfb03663afb19214b2759df30 // CraftBukkit start diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -index 4443a4a300d17e8568a81bcb9af89251d53a6a46..306da3808e98847534f4d4190c5b2f82ef50224c 100644 +index 4443a4a300d17e8568a81bcb9af89251d53a6a46..9ed04c56e840992a084f77bd667027ef0f6bb184 100644 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java -@@ -525,7 +525,7 @@ public class EnderMan extends Monster implements NeutralMob { +@@ -525,7 +525,15 @@ public class EnderMan extends Monster implements NeutralMob { @Override public boolean canUse() { if (!enderman.level.purpurConfig.endermanAllowGriefing) return false; // Purpur - return this.enderman.getCarriedBlock() == null ? false : (!this.enderman.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? false : this.enderman.getRandom().nextInt(reducedTickDelay(2000)) == 0); -+ return this.enderman.getCarriedBlock() != null ? false : (!this.enderman.level.purpurConfig.endermanBypassMobGriefing && !this.enderman.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? false : this.enderman.getRandom().nextInt(reducedTickDelay(2000)) == 0); // Purpur ++ // Purpur start ++ if (this.enderman.getCarriedBlock() == null) { ++ return false; ++ } ++ if (!this.enderman.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) && !this.enderman.level.purpurConfig.endermanBypassMobGriefing) { ++ return false; ++ } ++ return this.enderman.getRandom().nextInt(reducedTickDelay(2000)) == 0; ++ // Purpur end } @Override -@@ -573,7 +573,7 @@ public class EnderMan extends Monster implements NeutralMob { +@@ -573,7 +581,15 @@ public class EnderMan extends Monster implements NeutralMob { @Override public boolean canUse() { if (!enderman.level.purpurConfig.endermanAllowGriefing) return false; // Purpur - return this.enderman.getCarriedBlock() != null ? false : (!this.enderman.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? false : this.enderman.getRandom().nextInt(reducedTickDelay(20)) == 0); -+ return this.enderman.getCarriedBlock() == null ? false : (!this.enderman.level.purpurConfig.endermanBypassMobGriefing && !this.enderman.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? false : this.enderman.getRandom().nextInt(reducedTickDelay(2000)) == 0); // Purpur ++ // Purpur start ++ if (this.enderman.getCarriedBlock() != null) { ++ return false; ++ } ++ if (!this.enderman.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) && !this.enderman.level.purpurConfig.endermanBypassMobGriefing) { ++ return false; ++ } ++ return this.enderman.getRandom().nextInt(reducedTickDelay(20)) == 0; ++ // Purpur end } @Override