mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-15 23:25:37 +01:00
31 lines
1.6 KiB
Diff
31 lines
1.6 KiB
Diff
|
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/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
index 4c3a2e3cfd60321b3b74d143a32aa5f5d59d7e1e..34b45a6818209245fa5692a83cf4143030057095 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
@@ -196,7 +196,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 = org.bukkit.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;
|
||
|
|
|