38 Zeilen
2.0 KiB
Diff
38 Zeilen
2.0 KiB
Diff
|
From 0000000000000000000000000000000000000000 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 5a4c3a8c511f22c8c3240c9c7cd83a65119c1054..70e074cdf2087e638af8e0f3878d0ef8eb7305cc 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -186,4 +186,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/world/level/block/ChestBlock.java b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
|
||
|
|
index 1bda9a158eb4372b9ab7cf3097732e64810aefc6..6b95cd2e2af66eef324dfcc8f7642da2f9e39d4e 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/block/ChestBlock.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/block/ChestBlock.java
|
||
|
|
@@ -312,6 +312,11 @@ public class ChestBlock extends AbstractChestBlock<ChestBlockEntity> implements
|
||
|
|
}
|
||
|
|
|
||
|
|
private static boolean isCatSittingOnChest(LevelAccessor world, BlockPos pos) {
|
||
|
|
+ // Paper start - Option to disable chest cat detection
|
||
|
|
+ if (((Level) world).paperConfig.disableChestCatDetection) {
|
||
|
|
+ return false;
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
List<Cat> list = world.getEntitiesOfClass(Cat.class, new AABB((double) pos.getX(), (double) (pos.getY() + 1), (double) pos.getZ(), (double) (pos.getX() + 1), (double) (pos.getY() + 2), (double) (pos.getZ() + 1)));
|
||
|
|
|
||
|
|
if (!list.isEmpty()) {
|