geforkt von Mirrors/Paper
9ff01b16ab
This will be used by my next commit. But trying to get the build going since CI blew up
41 Zeilen
1.6 KiB
Diff
41 Zeilen
1.6 KiB
Diff
From e1ea0950cef2aa1054a3db5cb5c750602739fb22 Mon Sep 17 00:00:00 2001
|
|
From: Byteflux <byte@byteflux.net>
|
|
Date: Sat, 12 Mar 2016 13:37:50 -0600
|
|
Subject: [PATCH] Re-add Spigot's hopper-check feature
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index f967ec0..4d6e5fc 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -282,4 +282,9 @@ public class PaperWorldConfig {
|
|
private void nonPlayerEntitiesOnScoreboards() {
|
|
nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
|
|
}
|
|
+
|
|
+ public boolean useHopperCheck;
|
|
+ private void useHopperCheck() {
|
|
+ useHopperCheck = getBoolean("use-hopper-check", false);
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
|
|
index 4cd2caa..6406bed 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
|
|
@@ -178,6 +178,12 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
|
|
this.update();
|
|
return true;
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ if (world.paperConfig.useHopperCheck && !this.o()) {
|
|
+ this.setCooldown(world.spigotConfig.hopperCheck);
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
return false;
|
|
} else {
|
|
--
|
|
2.7.4
|
|
|