mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-10 13:44:51 +02:00
18b4817a33
Use -1 to represent vanilla/unlimited. Updated PaperWorldConfig to also update the individual worlds limit if it was set to the new default value. Should hopefully help #235
40 lines
1.8 KiB
Diff
40 lines
1.8 KiB
Diff
From f68afec9bf832efe71d3eb418eb72aa13eb7a7d4 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 e182e48..c89ab0c 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -239,4 +239,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 21be295..a5f2fc0 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockChest.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockChest.java
|
|
@@ -399,6 +399,11 @@ public class BlockChest extends BlockTileEntity {
|
|
}
|
|
|
|
private boolean j(World world, BlockPosition blockposition) {
|
|
+ // Paper start - Option ti dsiable chest cat detection
|
|
+ if (world.paperConfig.disableChestCatDetection) {
|
|
+ return false;
|
|
+ }
|
|
+ // Paper end
|
|
Iterator iterator = 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))).iterator();
|
|
|
|
EntityOcelot entityocelot;
|
|
--
|
|
2.8.2
|
|
|