From cb969e37a654c070d46fb55581dda88f0c3768cc Mon Sep 17 00:00:00 2001
From: PureGero <puregero@gmail.com>
Date: Tue, 16 Jun 2020 01:44:05 +1000
Subject: [PATCH] Don't teleport players; Fixes PS-14

---
 .../plotsquared/bukkit/listener/EntitySpawnListener.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
index e094baf9c..0bf5e75e8 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
@@ -100,15 +100,15 @@ public class EntitySpawnListener implements Listener {
             if (!originWorld.equals(world)) {
                 if (!ignoreTP) {
                     if (!world.getName().equalsIgnoreCase(originWorld + "_the_end")) {
+                        if (entity.getType() == EntityType.PLAYER) {
+                            return;
+                        }
                         try {
                             ignoreTP = true;
                             PaperLib.teleportAsync(entity, origin);
                         } finally {
                             ignoreTP = false;
                         }
-                        if (entity.getType() == EntityType.PLAYER) {
-                            return;
-                        }
                         if (entity.getLocation().getWorld().equals(world)) {
                             entity.remove();
                         }