From 5df9d2056fa0796011f5952005f26456f0640fe6 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 8 Aug 2020 16:12:30 -0500 Subject: [PATCH] Add option to disable dolphin treasure searching --- ...o-disable-dolphin-treasure-searching.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 patches/server/0124-Add-option-to-disable-dolphin-treasure-searching.patch diff --git a/patches/server/0124-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0124-Add-option-to-disable-dolphin-treasure-searching.patch new file mode 100644 index 000000000..0d3c10cba --- /dev/null +++ b/patches/server/0124-Add-option-to-disable-dolphin-treasure-searching.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Sat, 8 Aug 2020 16:11:51 -0500 +Subject: [PATCH] Add option to disable dolphin treasure searching + + +diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java +index 053ca43e50..6ac7cdea55 100644 +--- a/src/main/java/net/minecraft/server/EntityDolphin.java ++++ b/src/main/java/net/minecraft/server/EntityDolphin.java +@@ -320,6 +320,7 @@ public class EntityDolphin extends EntityWaterAnimal { + + @Override + public boolean a() { ++ if (this.a.world.purpurConfig.dolphinDisableTreasureSearching) return false; // Purpur + return this.a.gotFish() && this.a.getAirTicks() >= 100 && this.a.world.getWorld().canGenerateStructures(); // MC-151364, SPIGOT-5494: hangs if generate-structures=false + } + +diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +index 849c454057..9945c25a2e 100644 +--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java ++++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +@@ -354,6 +354,11 @@ public class PurpurWorldConfig { + creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance); + } + ++ public boolean dolphinDisableTreasureSearching = false; ++ private void dolphinSettings() { ++ dolphinDisableTreasureSearching = getBoolean("mobs.dolphin.disable-treasure-searching", dolphinDisableTreasureSearching); ++ } ++ + public boolean donkeyRidableInWater = false; + private void donkeySettings() { + donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);