70ce6ce831
This makes it easier for downstream projects (forks) to replace the version fetching system with their own. It is as simple as implementing an interface and overriding the default implementation of org.bukkit.UnsafeValues#getVersionFetcher() It also makes it easier for us to organize things like the version history feature. Lastly I have updated the paper implementation to check against the site API rather than against jenkins.
41 Zeilen
1.9 KiB
Diff
41 Zeilen
1.9 KiB
Diff
From bbe0f21f7cd3c2f44aa4e67a1edf3262979f012c 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 d663b15ce..278297039 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -176,4 +176,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 6b1c64e8f..ee9d91a8c 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockChest.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockChest.java
|
|
@@ -280,6 +280,11 @@ public class BlockChest extends BlockTileEntity implements IBlockWaterlogged {
|
|
}
|
|
|
|
private static boolean b(GeneratorAccess generatoraccess, BlockPosition blockposition) {
|
|
+ // Paper start - Option to disable chest cat detection
|
|
+ if (((World) generatoraccess).paperConfig.disableChestCatDetection) {
|
|
+ return false;
|
|
+ }
|
|
+ // Paper end
|
|
List<EntityCat> list = generatoraccess.a(EntityCat.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.21.0
|
|
|