PaperMC/Spigot-Server-Patches/0076-Re-add-Spigot-s-hopper-check-feature.patch

41 lines
1.6 KiB
Diff
Raw Normal View History

2016-06-09 05:57:14 +02:00
From 6e48e1f0bcab04adbb381b1488ef6708e5896277 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 308dfdd..48ea25c 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -269,4 +269,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
2016-06-09 05:57:14 +02:00
index d1ce2b9..197bdfe 100644
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
2016-06-09 05:57:14 +02:00
@@ -187,6 +187,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 {
--
2016-06-09 05:57:14 +02:00
2.8.3