Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-29 15:07:34 +02:00
Code Issues Projects Releases Wiki Activity

Move player to spawn point if spawn in unloaded world

Browse Source 
The code following this has better support for null worlds to move
them back to the world spawn.
This commit is contained in:
2277 2020-03-31 10:38:18 +01:00 committed by Aikar
parent f29c7ebd84
commit 68a7b9fec8
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Spigot-Server-Patches/0488-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch Normal file
View File

@ -0,0 +1,30 @@
From 3d7bdaea0c45ee77416c305159643fc4b397dfee 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 96a47dd1c2..46e631d466 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1790,9 +1790,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
bworld = server.getWorld(worldName);
}
- if (bworld == null) {
- bworld = ((org.bukkit.craftbukkit.CraftServer) server).getServer().getWorldServer(DimensionManager.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(DimensionManager.OVERWORLD).getWorld();
+ // }
+ // Paper end
spawnIn(bworld == null ? null : ((CraftWorld) bworld).getHandle());
}
--
2.25.1