core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0458-Move-player-to-spawn-p...

28 lines
1.5 KiB
Diff
Raw Normal View History

Rebuild all patches using the new rebuild pattern
2020-05-06 09:48:49 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
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.
2020-03-31 09:38:18 +00:00
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
[Auto] Updated Upstream (CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 049120068 SPIGOT-6101: Store persist state of entities 0de8365dd SPIGOT-6103: Summoning an Eye of Ender throw an Error Spigot Changes: b5a13e6d Rebuild patches
2020-08-26 08:46:59 +00:00
index 26c2adb04d995bf5c5ba4c5eee471be067bf8ac4..b21770e8549ed02ff68656584ecec1cf023542c5 100644
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.
2020-03-31 09:38:18 +00:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
[Auto] Updated Upstream (CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 049120068 SPIGOT-6101: Store persist state of entities 0de8365dd SPIGOT-6103: Summoning an Eye of Ender throw an Error Spigot Changes: b5a13e6d Rebuild patches
2020-08-26 08:46:59 +00:00
@@ -1717,9 +1717,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
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.
2020-03-31 09:38:18 +00:00
bworld = server.getWorld(worldName);
}
- if (bworld == null) {
even even even even even even more work
2020-06-26 01:53:21 +00:00
- bworld = ((org.bukkit.craftbukkit.CraftServer) server).getServer().getWorldServer(World.OVERWORLD).getWorld();
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.
2020-03-31 09:38:18 +00:00
- }
+ // Paper start - Move player to spawn point if spawn in unloaded world
even even even even even even more work
2020-06-26 01:53:21 +00:00
+// 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
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.
2020-03-31 09:38:18 +00:00
spawnIn(bworld == null ? null : ((CraftWorld) bworld).getHandle());
}