Fix a possible edge case with the ticking changes by delaying removal until next tick

CraftBukkit-Patches/0160-Allow-Capping-Tile-Entity-Tick-Time.patch

@@ -1,4 +1,4 @@
-From 68ec195e993411b192de078d2c00a47146558487 Mon Sep 17 00:00:00 2001
+From 117f0a804d1d06280a35b0eba884f1163a3676ff Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 20 Feb 2015 21:39:31 +1100
 Subject: [PATCH] Allow Capping (Tile)Entity Tick Time.
@@ -10,7 +10,7 @@ For tiles there is very little tradeoff for this option, as tile ticks are based
 This feature was commisioned by Chunkr.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c50aa62..ade51a9 100644
+index c50aa62..9806e49 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -134,6 +134,9 @@ public abstract class World implements IBlockAccess {
@@ -32,6 +32,15 @@ index c50aa62..ade51a9 100644
      }
  
      public World b() {
+@@ -1114,7 +1119,7 @@ public abstract class World implements IBlockAccess {
+             this.everyoneSleeping();
+         }
+ 
+-        if (!guardEntityList) { // Spigot - It will get removed after the tick if we are ticking
++        if (false) { // Spigot - It will get removed next tick
+         int i = entity.ae;
+         int j = entity.ag;
+ 
 @@ -1393,7 +1398,11 @@ public abstract class World implements IBlockAccess {
          timings.entityTick.startTiming(); // Spigot
          guardEntityList = true; // Spigot