5b6dfb3463
This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.
40 Zeilen
1.8 KiB
Diff
40 Zeilen
1.8 KiB
Diff
From e5ba54d156defe2e5ef5376a394ed5901136db0e Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Thu, 3 Mar 2016 01:13:45 -0600
|
|
Subject: [PATCH] Disable chest cat detection
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index 26d8dbb60..43aa73e1d 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -172,4 +172,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 d55122c66..f8be07258 100644
|
|
--- 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
|
|
}
|
|
|
|
private boolean b(World world, BlockPosition blockposition) {
|
|
+ // Paper start - Option to disable chest cat detection
|
|
+ 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)));
|
|
|
|
if (!list.isEmpty()) {
|
|
--
|
|
2.18.0
|
|
|