Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ci-skip] there's some import tomfoolery happening in these patches...

Browse Source
This commit is contained in:
granny
2023-01-22 12:09:40 -08:00
parent d1bffa3efb
commit 5fd16185b5
4 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0022-Add-turtle-egg-block-options.patch
View File

@@ -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) {

4
patches/server/0126-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -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;

4
patches/server/0238-Turtle-eggs-random-tick-crack-chance.patch
View File

@@ -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);

4
patches/server/0259-Option-to-disable-turtle-egg-trampling-with-feather-.patch
View File

@@ -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;
}