From 5fd16185b59ae0b6f82aa89fc1ececf7d581a39c Mon Sep 17 00:00:00 2001 From: granny Date: Sun, 22 Jan 2023 12:09:40 -0800 Subject: [PATCH] [ci-skip] there's some import tomfoolery happening in these patches... --- .../server/0022-Add-turtle-egg-block-options.patch | 14 +++----------- ...mobGriefing-bypass-to-everything-affected.patch | 4 ++-- ...0238-Turtle-eggs-random-tick-crack-chance.patch | 4 ++-- ...isable-turtle-egg-trampling-with-feather-.patch | 4 ++-- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/patches/server/0022-Add-turtle-egg-block-options.patch b/patches/server/0022-Add-turtle-egg-block-options.patch index 0e7701193..e791c481c 100644 --- a/patches/server/0022-Add-turtle-egg-block-options.patch +++ b/patches/server/0022-Add-turtle-egg-block-options.patch @@ -5,24 +5,16 @@ Subject: [PATCH] Add turtle egg block options diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java -index 70d46aafa9c16921e5c5bed3d97b8f402e25038a..1cc3e156eb612a7dc0a771d38252525c1884eaea 100644 +index 70d46aafa9c16921e5c5bed3d97b8f402e25038a..9925cfc1445d24bf673e273f81391a1dadfb677d 100644 --- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java -@@ -10,7 +10,6 @@ import net.minecraft.util.RandomSource; - import net.minecraft.world.entity.Entity; - import net.minecraft.world.entity.EntityType; - import net.minecraft.world.entity.LivingEntity; --import net.minecraft.world.entity.ambient.Bat; - import net.minecraft.world.entity.animal.Turtle; - import net.minecraft.world.entity.monster.Zombie; - import net.minecraft.world.entity.player.Player; -@@ -193,6 +192,25 @@ public class TurtleEggBlock extends Block { +@@ -193,6 +193,25 @@ public class TurtleEggBlock extends Block { } private boolean canDestroyEgg(Level world, Entity entity) { - return !(entity instanceof Turtle) && !(entity instanceof Bat) ? (!(entity instanceof LivingEntity) ? false : entity instanceof Player || world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) : false; + // Purpur start -+ if (entity instanceof Turtle || entity instanceof net.minecraft.world.entity.ambient.Bat) { ++ if (entity instanceof Turtle || entity instanceof Bat) { + return false; + } + if (!world.purpurConfig.turtleEggsBreakFromExpOrbs && entity instanceof net.minecraft.world.entity.ExperienceOrb) { diff --git a/patches/server/0126-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0126-Add-mobGriefing-bypass-to-everything-affected.patch index e569f1f3c..b4839d8b1 100644 --- a/patches/server/0126-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0126-Add-mobGriefing-bypass-to-everything-affected.patch @@ -361,10 +361,10 @@ index 518d3832c36c9ecf1ed9267ffc1f926dc84b7989..af5933b886abf3fd17bfdb8c1cb1ea63 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java -index 1cc3e156eb612a7dc0a771d38252525c1884eaea..2543bae9e919fff36d74cd09e295a88534b61f76 100644 +index 9925cfc1445d24bf673e273f81391a1dadfb677d..dc3c8eb78439f0bf7420eb41b6f3925cf701e0c5 100644 --- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java -@@ -210,7 +210,7 @@ public class TurtleEggBlock extends Block { +@@ -211,7 +211,7 @@ public class TurtleEggBlock extends Block { } if (entity instanceof Player) return true; diff --git a/patches/server/0238-Turtle-eggs-random-tick-crack-chance.patch b/patches/server/0238-Turtle-eggs-random-tick-crack-chance.patch index 8b4923185..418b87113 100644 --- a/patches/server/0238-Turtle-eggs-random-tick-crack-chance.patch +++ b/patches/server/0238-Turtle-eggs-random-tick-crack-chance.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Turtle eggs random tick crack chance diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java -index 2543bae9e919fff36d74cd09e295a88534b61f76..2abca4edcab17a2814a457461923a656810043f5 100644 +index dc3c8eb78439f0bf7420eb41b6f3925cf701e0c5..0a1242c2749dad6affe9e17625831705be7467cc 100644 --- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java -@@ -159,7 +159,7 @@ public class TurtleEggBlock extends Block { +@@ -160,7 +160,7 @@ public class TurtleEggBlock extends Block { private boolean shouldUpdateHatchLevel(Level world) { float f = world.getTimeOfDay(1.0F); diff --git a/patches/server/0259-Option-to-disable-turtle-egg-trampling-with-feather-.patch b/patches/server/0259-Option-to-disable-turtle-egg-trampling-with-feather-.patch index b0b6bbd8d..2e90737a0 100644 --- a/patches/server/0259-Option-to-disable-turtle-egg-trampling-with-feather-.patch +++ b/patches/server/0259-Option-to-disable-turtle-egg-trampling-with-feather-.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Option to disable turtle egg trampling with feather falling diff --git a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java -index 2abca4edcab17a2814a457461923a656810043f5..ca4aec45bb0251ac371e6f00dff8f2d59fdf15b1 100644 +index 0a1242c2749dad6affe9e17625831705be7467cc..22ed1e32fd2ca27a3a43cd1a3e48e39d89b93b5e 100644 --- a/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TurtleEggBlock.java -@@ -208,7 +208,13 @@ public class TurtleEggBlock extends Block { +@@ -209,7 +209,13 @@ public class TurtleEggBlock extends Block { if (!(entity instanceof LivingEntity)) { return false; }