From 950ad80c153b751769d26c28056a39adf2f88594 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sat, 16 Jul 2016 20:10:43 -0500
Subject: [PATCH] Remove use-hopper-check functionality that we restored Our
 improved hopper checking system should provide a better benefit without as
 many vanilla behavior issues.

---
 ...item-frames-performance-and-bug-fixe.patch |  2 +-
 ...Improve-Minecraft-Hopper-Performance.patch |  2 +-
 ...Re-add-Spigot-s-hopper-check-feature.patch | 38 -------------------
 .../Undead-horse-leashing.patch               |  4 +-
 4 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 Spigot-Server-Patches/Re-add-Spigot-s-hopper-check-feature.patch

diff --git a/Spigot-Server-Patches/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 51a96ea9f4..d8a667d591 100644
--- a/Spigot-Server-Patches/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+index 0000000000000000000000000000000000000000..00000000000000000000000000000000000000007 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
diff --git a/Spigot-Server-Patches/Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/Improve-Minecraft-Hopper-Performance.patch
index ed82246c76..fdba9c9b1f 100644
--- a/Spigot-Server-Patches/Improve-Minecraft-Hopper-Performance.patch
+++ b/Spigot-Server-Patches/Improve-Minecraft-Hopper-Performance.patch
@@ -31,8 +31,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -0,0 +0,0 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
+                     return true;
                  }
-                 // Paper end
              }
 +
              return false;
diff --git a/Spigot-Server-Patches/Re-add-Spigot-s-hopper-check-feature.patch b/Spigot-Server-Patches/Re-add-Spigot-s-hopper-check-feature.patch
deleted file mode 100644
index 6c01d7b950..0000000000
--- a/Spigot-Server-Patches/Re-add-Spigot-s-hopper-check-feature.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/TileEntityHopper.java
-+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
-@@ -0,0 +0,0 @@ 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 {
---
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Undead-horse-leashing.patch b/Spigot-Server-Patches/Undead-horse-leashing.patch
index 563a8018b7..6e5dac0642 100644
--- a/Spigot-Server-Patches/Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/Undead-horse-leashing.patch
@@ -10,8 +10,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
-     private void useHopperCheck() {
-         useHopperCheck = getBoolean("use-hopper-check", false);
+     private void nonPlayerEntitiesOnScoreboards() {
+         nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
      }
 +
 +    public boolean allowLeashingUndeadHorse = false;