mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-29 15:07:34 +02:00
adadf16548
I'm not sure it was really helping, and now suspecting it might be causing issues Movement sucks
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/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
|
index f8e0742ea9a42cf496b4b7e00201fed025b83889..9e438590113b2c7a318c812637c8aa14341df3e6 100644
|
|
--- 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;
|
|
|