Files
Purpur/patches/server/0025-Add-config-for-items-breaking-turtle-eggs.patch
2019-08-01 12:28:25 -05:00

51 lines
2.1 KiB
Diff

From 77f10a01dd4804673ad11a080ba31150b1b0dfb3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 22:15:46 -0500
Subject: [PATCH] Add config for items breaking turtle eggs
---
.../java/net/minecraft/server/BlockTurtleEgg.java | 13 ++++++++++++-
.../java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
index 0118a845..83e69425 100644
--- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
+++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
@@ -163,6 +163,17 @@ public class BlockTurtleEgg extends Block {
}
private boolean a(World world, Entity entity) {
- return entity instanceof EntityTurtle ? false : (entity instanceof EntityLiving && !(entity instanceof EntityHuman) ? world.getGameRules().getBoolean(GameRules.MOB_GRIEFING) : true);
+ // Purpur start
+ if (entity instanceof EntityTurtle) {
+ return false;
+ }
+ if (!world.purpurConfig.itemsCanBreakTurtleEggs && entity instanceof EntityItem) {
+ return false;
+ }
+ if (entity instanceof EntityLiving && !(entity instanceof EntityHuman)) {
+ return world.getGameRules().getBoolean(GameRules.MOB_GRIEFING);
+ }
+ return true;
+ // Purpur end
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 82643156..bc782e2f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -103,4 +103,9 @@ public class PurpurWorldConfig {
private void allowSignColors() {
allowSignColors = getBoolean("allow-sign-colors", allowSignColors);
}
+
+ public boolean itemsCanBreakTurtleEggs = false;
+ private void itemsCanBreakTurtleEggs() {
+ itemsCanBreakTurtleEggs = getBoolean("items-can-break-turtle-eggs", itemsCanBreakTurtleEggs);
+ }
}
--
2.20.1