Paper/Spigot-Server-Patches/0044-Configurable-Disabling-Cat-Chest-Detection.patch

41 lines
1.9 KiB
Diff
Raw Normal View History

From 450ef34e2ad19b38f7904431dc535982919b165d Mon Sep 17 00:00:00 2001
2016-03-01 00:09:49 +01:00
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 01:13:45 -0600
2018-07-23 01:39:56 +02:00
Subject: [PATCH] Configurable Disabling Cat Chest Detection
2016-03-01 00:09:49 +01:00
2018-07-23 01:39:56 +02:00
Offers a gameplay feature to stop cats from blocking chests
2016-03-01 00:09:49 +01:00
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index f8d2aae08..d91b48b0a 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -173,4 +173,9 @@ public class PaperWorldConfig {
2016-03-01 00:09:49 +01:00
private void containerUpdateTickRate() {
containerUpdateTickRate = getInt("container-update-tick-rate", 1);
}
+
+ public boolean disableChestCatDetection;
+ private void disableChestCatDetection() {
+ disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
+ }
}
diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
2018-07-23 01:39:56 +02:00
index 0f6902747..1ad39aca3 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/net/minecraft/server/BlockChest.java
+++ b/src/main/java/net/minecraft/server/BlockChest.java
@@ -235,6 +235,11 @@ public class BlockChest extends BlockTileEntity implements IFluidSource, IFluidC
2016-03-01 00:09:49 +01:00
}
private boolean b(World world, BlockPosition blockposition) {
+ // Paper start - Option to disable chest cat detection
2016-03-01 00:09:49 +01:00
+ if (world.paperConfig.disableChestCatDetection) {
+ return false;
+ }
+ // Paper end
List list = world.a(EntityOcelot.class, new AxisAlignedBB((double) blockposition.getX(), (double) (blockposition.getY() + 1), (double) blockposition.getZ(), (double) (blockposition.getX() + 1), (double) (blockposition.getY() + 2), (double) (blockposition.getZ() + 1)));
2016-03-01 00:09:49 +01:00
if (!list.isEmpty()) {
2016-03-01 00:09:49 +01:00
--
2.18.0
2016-03-01 00:09:49 +01:00