2018-09-01 06:56:57 +08:00
|
|
|
From b24a519f9092f69021b72e5a48e3c8514669932a Mon Sep 17 00:00:00 2001
|
2016-03-01 07:09:49 +08:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Thu, 3 Mar 2016 01:13:45 -0600
|
2018-07-23 07:39:56 +08:00
|
|
|
Subject: [PATCH] Configurable Disabling Cat Chest Detection
|
2016-03-01 07:09:49 +08:00
|
|
|
|
2018-07-23 07:39:56 +08:00
|
|
|
Offers a gameplay feature to stop cats from blocking chests
|
2016-03-01 07:09:49 +08:00
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2018-09-01 06:56:57 +08:00
|
|
|
index 34007dbf4f..b27934cfc5 100644
|
2016-03-01 07:09:49 +08:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2018-07-24 08:24:44 +08:00
|
|
|
@@ -173,4 +173,9 @@ public class PaperWorldConfig {
|
2016-03-01 07:09:49 +08: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-09-01 06:56:57 +08:00
|
|
|
index 5401f7d754..27e6d2b5f2 100644
|
2016-03-01 07:09:49 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/BlockChest.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/BlockChest.java
|
2018-09-01 06:56:57 +08:00
|
|
|
@@ -216,6 +216,11 @@ public class BlockChest extends BlockTileEntity implements IFluidSource, IFluidC
|
2016-03-01 07:09:49 +08:00
|
|
|
}
|
|
|
|
|
2018-07-15 09:53:17 +08:00
|
|
|
private boolean b(World world, BlockPosition blockposition) {
|
|
|
|
+ // Paper start - Option to disable chest cat detection
|
2016-03-01 07:09:49 +08:00
|
|
|
+ if (world.paperConfig.disableChestCatDetection) {
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2018-09-01 06:56:57 +08:00
|
|
|
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
|
2018-07-15 09:53:17 +08:00
|
|
|
if (!list.isEmpty()) {
|
2018-09-01 06:56:57 +08:00
|
|
|
for(EntityOcelot entityocelot : list) {
|
2016-03-01 07:09:49 +08:00
|
|
|
--
|
2018-07-04 15:55:24 +08:00
|
|
|
2.18.0
|
2016-03-01 07:09:49 +08:00
|
|
|
|