41 lines
1.9 KiB
Diff
41 lines
1.9 KiB
Diff
From ccf869e8a33ffd31f1c7098cfff42a9fd7d2e743 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Thu, 3 Mar 2016 01:13:45 -0600
|
|
Subject: [PATCH] Configurable Disabling Cat Chest Detection
|
|
|
|
Offers a gameplay feature to stop cats from blocking chests
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index 71af3fcfed..e28d5b19a3 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -175,4 +175,9 @@ public class PaperWorldConfig {
|
|
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
|
|
index 5401f7d754..27e6d2b5f2 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockChest.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockChest.java
|
|
@@ -216,6 +216,11 @@ public class BlockChest extends BlockTileEntity implements IFluidSource, IFluidC
|
|
}
|
|
|
|
private boolean b(World world, BlockPosition blockposition) {
|
|
+ // Paper start - Option to disable chest cat detection
|
|
+ if (world.paperConfig.disableChestCatDetection) {
|
|
+ return false;
|
|
+ }
|
|
+ // Paper end
|
|
List<EntityOcelot> 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))); // Paper - decompile fix
|
|
if (!list.isEmpty()) {
|
|
for(EntityOcelot entityocelot : list) {
|
|
--
|
|
2.19.0
|
|
|