From b36d42811a354b31a2bc00c6ee3e65b248cabf30 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 12 Mar 2018 17:26:40 +1100
Subject: [PATCH] Fixes #1897

---
 Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
index 29925f895..a2762cd58 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
@@ -450,7 +450,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                                         if (!(passenger instanceof Player) && entity.getMetadata("keep").isEmpty()) {
                                                             iterator.remove();
                                                             entity.remove();
-                                                            entity = null;
+                                                            continue;
                                                         }
                                                     }
                                                 } else {
@@ -458,7 +458,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                                     if (!(passenger instanceof Player) && entity.getMetadata("keep").isEmpty()) {
                                                         iterator.remove();
                                                         entity.remove();
-                                                        entity = null;
+                                                        continue;
                                                     }
                                                 }
                                             }