From 4e4f7912da77311eabcbdb5031eef605864a3dac Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sun, 22 Apr 2018 15:29:03 -0400
Subject: [PATCH] Remove patches that got added back in merge

Fix build
---
 ...Allowance-of-Permanent-Chunk-Loaders.patch |  2 +-
 ...GOT-3894-to-restore-vanilla-behavior.patch | 26 -------------------
 ...r-reloading-of-pending-unload-chunks.patch | 23 ----------------
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 Spigot-Server-Patches/Revert-SPIGOT-3894-to-restore-vanilla-behavior.patch
 delete mode 100644 Spigot-Server-Patches/revert-Better-reloading-of-pending-unload-chunks.patch

diff --git a/Spigot-Server-Patches/Configurable-Allowance-of-Permanent-Chunk-Loaders.patch b/Spigot-Server-Patches/Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
index 2b008e2591..71aa127d18 100644
--- a/Spigot-Server-Patches/Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
+++ b/Spigot-Server-Patches/Configurable-Allowance-of-Permanent-Chunk-Loaders.patch
@@ -7,7 +7,7 @@ This disables the behavior that allows players to keep chunks permanently loaded
 by default and allows server operators to enable it if they wish.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c903c89cf..e1ed267a2 100644
+index 9ef2b1635..cc1914d8c 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 {
diff --git a/Spigot-Server-Patches/Revert-SPIGOT-3894-to-restore-vanilla-behavior.patch b/Spigot-Server-Patches/Revert-SPIGOT-3894-to-restore-vanilla-behavior.patch
deleted file mode 100644
index 944f53b004..0000000000
--- a/Spigot-Server-Patches/Revert-SPIGOT-3894-to-restore-vanilla-behavior.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 18 Apr 2018 01:42:42 -0400
-Subject: [PATCH] Revert SPIGOT-3894 to restore vanilla behavior
-
-reporter of this issue was incorrect and did not verify vanilla logic
-
-vanilla logic only skips ticks if the flag is set
-
-spigots change causes bugs as it now skips ticking and processing
-chunk teleportation, which was a bug I fixed many many years ago...
-
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4ce846b5..6c92f93a 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 {
-         // CraftBukkit end
- 
-         // Spigot start
--        if (!org.spigotmc.ActivationRange.checkIfActive(entity)) {
-+        if (flag && !org.spigotmc.ActivationRange.checkIfActive(entity)) { // Paper - Revert spigot change back to vanilla
-             entity.ticksLived++;
-             entity.inactiveTick();
-             return;
---
\ No newline at end of file
diff --git a/Spigot-Server-Patches/revert-Better-reloading-of-pending-unload-chunks.patch b/Spigot-Server-Patches/revert-Better-reloading-of-pending-unload-chunks.patch
deleted file mode 100644
index d7dbcd336a..0000000000
--- a/Spigot-Server-Patches/revert-Better-reloading-of-pending-unload-chunks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 8 Apr 2018 01:21:23 +0100
-Subject: [PATCH] revert "Better reloading of pending unload chunks"
-
-many areas of NMS calls through to this method which means that
-the server can easilly keep chunks loaded in certain conditions
-even when they're no longer needed.
-
-diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 55dada66..2ed3fc40 100644
---- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
-+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
-     }
- 
-     public Chunk getChunkAt(int i, int j, Runnable runnable, boolean generate) {
--        Chunk chunk = getLoadedChunkAt(i, j);
-+        Chunk chunk = getChunkIfLoaded(i, j); // Paper - revert "Better reloading of pending unload chunks" (see patch)
-         ChunkRegionLoader loader = null;
- 
-         if (this.chunkLoader instanceof ChunkRegionLoader) {
---
\ No newline at end of file