core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0453-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
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 1e843b72 #510: Add NamespacedKey#fromString() to fetch from user input a4d18241 #581: Add methods to modify despawn delay for wandering villagers CraftBukkit Changes: 0cd8f19f #802: Add methods to modify despawn delay for wandering villagers d5c5d998 SPIGOT-6362: ConcurrentModificationException: null --> Server Crash 8c7d69fe SPIGOT-5228: Entities that are removed during chunk unloads are not properly removed from the chunk.
2021-02-16 17:08:29 +00:00
index 1ed26fa55b149e3717cf190abde8f865a4c076eb..e4422d7cd70410e50ee9e86d3c832f7df65197df 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
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#4728) 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 Bukkit Changes: 30885166 Update to Minecraft 1.16.4 CraftBukkit Changes: 3af81c71 Update to Minecraft 1.16.4 Spigot Changes: f011ca24 Update to Minecraft 1.16.4 Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
2020-11-03 02:22:15 +00:00
@@ -1719,9 +1719,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());
}