Make entities appear at world spawn when they go trough exit end portal

Multiverse · Apr 8, 2024 · fb2cfbb · fb2cfbb
1 parent 7a46c67
commit fb2cfbb
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/main/java/com/onarandombox/MultiverseNetherPortals/listeners/MVNPEntityListener.java b/src/main/java/com/onarandombox/MultiverseNetherPortals/listeners/MVNPEntityListener.java
@@ -146,9 +146,12 @@ private Location getLocation(Entity e, Location currentLocation, PortalType type
             } else {
                 String destinationWorld = "";
 
+                boolean shouldAppearAtSpawn = false;
+
                 if (this.nameChecker.isValidEndName(currentWorld)) {
                     if (type == PortalType.ENDER) {
                         destinationWorld = this.nameChecker.getNormalName(currentWorld, type);
+                        shouldAppearAtSpawn = true;
                     } else if (type == PortalType.NETHER) {
                         destinationWorld = this.nameChecker.getNetherName(this.nameChecker.getNormalName(currentWorld, type));
                     }
@@ -166,7 +169,14 @@ private Location getLocation(Entity e, Location currentLocation, PortalType type
                     }
                 }
 
-                newTo = this.linkChecker.findNewTeleportLocation(currentLocation, destinationWorld, e);
+                if (shouldAppearAtSpawn) {
+                    MultiverseWorld tpTo = this.worldManager.getMVWorld(destinationWorld);
+                    newTo = this.linkChecker.findNewTeleportLocation(tpTo.getSpawnLocation(), destinationWorld, e);
+
+                } else {
+                    newTo = this.linkChecker.findNewTeleportLocation(currentLocation, destinationWorld, e);
+                }
+
             }
         }