From 82b984184a1853a7a6d95c06ce9c4733ef06ca28 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 22 Apr 2020 02:52:17 -0400 Subject: [PATCH] Fix some issues with async login as well another source of sync loads --- ...Load-Chunks-for-Login-Asynchronously.patch | 65 ++++++++++++------- ...0489-Allow-sleeping-players-to-float.patch | 6 +- 2 files changed, 43 insertions(+), 28 deletions(-) diff --git a/Spigot-Server-Patches/0487-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0487-Load-Chunks-for-Login-Asynchronously.patch index bd4689737b..92712c6d50 100644 --- a/Spigot-Server-Patches/0487-Load-Chunks-for-Login-Asynchronously.patch +++ b/Spigot-Server-Patches/0487-Load-Chunks-for-Login-Asynchronously.patch @@ -1,41 +1,56 @@ -From d1b5d9b592e1f4d6763a1d8e4873d4752975bb72 Mon Sep 17 00:00:00 2001 +From 10bdc874204a77a667627b26415a054606f5f841 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 Apr 2020 04:28:29 -0400 Subject: [PATCH] Load Chunks for Login Asynchronously +diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java +index 96a47dd1c2..96ebe0b226 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -1382,7 +1382,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke + this.pitch = MathHelper.a(f1, -90.0F, 90.0F) % 360.0F; + this.lastYaw = this.yaw; + this.lastPitch = this.pitch; +- world.getChunkAt((int) Math.floor(this.locX) >> 4, (int) Math.floor(this.locZ) >> 4); // CraftBukkit ++ if (valid) world.getChunkAt((int) Math.floor(this.locX) >> 4, (int) Math.floor(this.locZ) >> 4); // CraftBukkit // Paper + } + + public void setPositionRotation(BlockPosition blockposition, float f, float f1) { +diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java +index 7929fcc800..c3710b73af 100644 +--- a/src/main/java/net/minecraft/server/PlayerConnection.java ++++ b/src/main/java/net/minecraft/server/PlayerConnection.java +@@ -142,6 +142,7 @@ public class PlayerConnection implements PacketListenerPlayIn { + // CraftBukkit end + + public void tick() { ++ if (!this.player.valid) return; // Paper + this.syncPosition(); + this.player.lastX = this.player.locX(); + this.player.lastY = this.player.locY(); diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index c2850d50d..d145c4bf1 100644 +index ec45c30dd3..de55423686 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -106,8 +106,9 @@ public abstract class PlayerList { - // CraftBukkit start - Better rename detection - if (nbttagcompound != null && nbttagcompound.hasKey("bukkit")) { - NBTTagCompound bukkit = nbttagcompound.getCompound("bukkit"); -- s = bukkit.hasKeyOfType("lastKnownName", 8) ? bukkit.getString("lastKnownName") : s; -+ s = bukkit.hasKeyOfType("lastKnownName", 8) ? bukkit.getString("lastKnownName") : s; // Diff below - } -+ String lastKnownName = s; // Paper - if (nbttagcompound == null) entityplayer.moveToSpawn(worldserver); // Paper - only move to spawn on first login, otherwise, stay where you are.... - // CraftBukkit end - -@@ -132,6 +133,16 @@ public abstract class PlayerList { - entityplayer.setYawPitch(loc.getYaw(), loc.getPitch()); - // Spigot end - +@@ -173,6 +173,17 @@ public abstract class PlayerList { + this.players.add(entityplayer); + this.playersByName.put(entityplayer.getName().toLowerCase(java.util.Locale.ROOT), entityplayer); // Spigot + this.j.put(entityplayer.getUniqueID(), entityplayer); + // Paper start - async load spawn in chunk + WorldServer finalWorldserver = worldserver; + worldserver.getChunkProvider().getTickingChunkAsync(loc.getBlockX() >> 4, loc.getBlockZ() >> 4, (chunk -> { // use ticking - as it has at least 1 neighbours loaded -+ if (networkmanager.isConnected()) { -+ postChunkLoadJoin(entityplayer, finalWorldserver, nbttagcompound, networkmanager, lastKnownName, networkmanager.getSocketAddress().toString()); -+ } ++ postChunkLoadJoin(entityplayer, finalWorldserver, playerconnection, nbttagcompound, networkmanager.getSocketAddress().toString(), joinMessage); + })); + } -+ private void postChunkLoadJoin(EntityPlayer entityplayer, WorldServer worldserver, NBTTagCompound nbttagcompound, NetworkManager networkmanager, String s, String s1) { ++ private void postChunkLoadJoin(EntityPlayer entityplayer, WorldServer worldserver, PlayerConnection playerconnection, NBTTagCompound nbttagcompound, String s1, String joinMessage) { ++ if (!entityplayer.playerConnection.networkManager.isConnected()) { ++ return; ++ } + // Paper end - // CraftBukkit - Moved message to after join - // PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", entityplayer.getDisplayName().getString(), s1, entityplayer.getId(), entityplayer.locX(), entityplayer.locY(), entityplayer.locZ()); - WorldData worlddata = worldserver.getWorldData(); + // this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[]{entityplayer})); // CraftBukkit - replaced with loop below + + // Paper start - correctly register player BEFORE PlayerJoinEvent, so the entity is valid and doesn't require tick delay hacks -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0489-Allow-sleeping-players-to-float.patch b/Spigot-Server-Patches/0489-Allow-sleeping-players-to-float.patch index 1aaf899dbf..7912c1bd66 100644 --- a/Spigot-Server-Patches/0489-Allow-sleeping-players-to-float.patch +++ b/Spigot-Server-Patches/0489-Allow-sleeping-players-to-float.patch @@ -1,4 +1,4 @@ -From 745817e332e81fcd0cf237255f0ed25855c44d07 Mon Sep 17 00:00:00 2001 +From 6605201ac028dec660b246c5fa87d370d08f069f Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Sun, 19 Apr 2020 12:25:20 +0200 Subject: [PATCH] Allow sleeping players to float @@ -9,10 +9,10 @@ their position to the ground/exit location when entering the bed, resulting in the server believing they're still in the air. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 7929fcc800..8f93a7758c 100644 +index c3710b73af..b62535ba04 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -150,7 +150,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -151,7 +151,7 @@ public class PlayerConnection implements PacketListenerPlayIn { this.player.setLocation(this.l, this.m, this.n, this.player.yaw, this.player.pitch); ++this.e; this.processedMovePackets = this.receivedMovePackets;