From b924809c91cd5e843430918b051af6b64447d871 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Thu, 3 Aug 2017 23:13:04 +1000
Subject: [PATCH] Fixes #1608

---
 .../bukkit/util/block/BukkitLocalQueue_1_9.java            | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_9.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_9.java
index 580c7f664..351a69243 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_9.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue_1_9.java
@@ -260,7 +260,7 @@ public class BukkitLocalQueue_1_9 extends BukkitLocalQueue<char[]> {
             Method ym = null;
             Method zm = null;
             // Trim tiles
-            boolean removed = false;
+            Collection tickList = ((Collection) this.tileEntityListTick.of(w).get());
             Set<Map.Entry<?, ?>> entrySet = (Set<Map.Entry<?, ?>>) (Set<?>) tiles.entrySet();
             Iterator<Map.Entry<?, ?>> iterator = entrySet.iterator();
             while (iterator.hasNext()) {
@@ -282,13 +282,10 @@ public class BukkitLocalQueue_1_9 extends BukkitLocalQueue<char[]> {
                     continue;
                 }
                 if (array[k] != 0) {
-                    removed = true;
+                    tickList.remove(tile.getValue());
                     iterator.remove();
                 }
             }
-            if (removed) {
-                ((Collection) this.tileEntityListTick.of(w).get()).clear();
-            }
 
             // Trim entities
             for (int i = 0; i < 16; i++) {