From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: 2277 <38501234+2277@users.noreply.github.com> Date: Tue, 31 Mar 2020 10:33:55 +0100 Subject: [PATCH] Move player to spawn point if spawn in unloaded world The code following this has better support for null worlds to move them back to the world spawn. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 561610ee1a99c781ccabd600812a0d10cd4ba785..f31f4fdecc824b27afefc79d1791a293227cbc9c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1754,9 +1754,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke bworld = server.getWorld(worldName); } - if (bworld == null) { - bworld = ((org.bukkit.craftbukkit.CraftServer) server).getServer().getWorldServer(World.OVERWORLD).getWorld(); - } + // Paper start - Move player to spawn point if spawn in unloaded world +// if (bworld == null) { +// bworld = ((org.bukkit.craftbukkit.CraftServer) server).getServer().getWorldServer(World.OVERWORLD).getWorld(); +// } + // Paper end - Move player to spawn point if spawn in unloaded world spawnIn(bworld == null ? null : ((CraftWorld) bworld).getHandle()); }