2020-07-03 18:57:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Wyatt Childers <wchilders@nearce.com>
|
|
|
|
Date: Fri, 3 Jul 2020 14:57:05 -0400
|
|
|
|
Subject: [PATCH] Spawn player in correct world on login
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
2020-11-19 15:15:16 +00:00
|
|
|
index 82e3ddc25f1b9f3cbf25a457227335df27ae5d0f..4bbf55379a02ab21b8caac96f894dc920a083635 100644
|
2020-07-03 18:57:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
|
|
@@ -119,7 +119,18 @@ public abstract class PlayerList {
|
|
|
|
}String lastKnownName = s; // Paper
|
|
|
|
// CraftBukkit end
|
|
|
|
|
|
|
|
- if (nbttagcompound != null) {
|
|
|
|
+ // Paper start - move logic in Entity to here, to use bukkit supplied world UUID.
|
|
|
|
+ if (nbttagcompound != null && nbttagcompound.hasKey("WorldUUIDMost") && nbttagcompound.hasKey("WorldUUIDLeast")) {
|
|
|
|
+ UUID uid = new UUID(nbttagcompound.getLong("WorldUUIDMost"), nbttagcompound.getLong("WorldUUIDLeast"));
|
|
|
|
+ org.bukkit.World bWorld = Bukkit.getServer().getWorld(uid);
|
|
|
|
+ if (bWorld != null) {
|
|
|
|
+ resourcekey = ((CraftWorld) bWorld).getHandle().getDimensionKey();
|
|
|
|
+ } else {
|
|
|
|
+ resourcekey = World.OVERWORLD;
|
|
|
|
+ }
|
|
|
|
+ } else if (nbttagcompound != null) {
|
|
|
|
+ // Vanilla migration support
|
|
|
|
+ // Paper end
|
|
|
|
DataResult dataresult = DimensionManager.a(new Dynamic(DynamicOpsNBT.a, nbttagcompound.get("Dimension")));
|
|
|
|
Logger logger = PlayerList.LOGGER;
|
|
|
|
|