3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-15 04:20:04 +01:00

Re-add Spigot's hopper-check feature

Closes GH-77
Dieser Commit ist enthalten in:
Zach Brown 2016-03-12 13:41:26 -06:00
Ursprung c231a1b9e9
Commit bdb9292082

Datei anzeigen

@ -0,0 +1,40 @@
From c69bda93df37e18b4d1f399e72831864ec9dc011 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 c47de89..56e513e 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -274,4 +274,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..ffe0395 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.2