Fix PlayerClientLoadedWorldEvent calls (#13374)

Author: lynxplay

paper-server/patches/features/0023-Optimise-collision-checking-in-player-move-packet-ha.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise collision checking in player move packet handling
 Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision
 
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1c5750c258bfb4b551048670a5e73a19a813ec47..ad4d20dda67ffb37e15a1623104a6e23417cc68e 100644
+index 96f1ffabd7d5e60f6d843cf5081f4f137c07ee99..59b664b69b68313d02d06d952ea9d2e6d602500f 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -623,6 +623,7 @@ public class ServerGamePacketListenerImpl
@@ -78,7 +78,7 @@ index 1c5750c258bfb4b551048670a5e73a19a813ec47..ad4d20dda67ffb37e15a1623104a6e23
      }
 
      @Override
-@@ -1509,7 +1542,7 @@ public class ServerGamePacketListenerImpl
+@@ -1502,7 +1535,7 @@ public class ServerGamePacketListenerImpl
                                      }
                                  }
 
@@ -87,15 +87,15 @@ index 1c5750c258bfb4b551048670a5e73a19a813ec47..ad4d20dda67ffb37e15a1623104a6e23
                                  d3 = d - this.lastGoodX; // Paper - diff on change, used for checking large move vectors above
                                  d4 = d1 - this.lastGoodY; // Paper - diff on change, used for checking large move vectors above
                                  d5 = d2 - this.lastGoodZ; // Paper - diff on change, used for checking large move vectors above
-@@ -1548,6 +1581,7 @@ public class ServerGamePacketListenerImpl
+@@ -1541,6 +1574,7 @@ public class ServerGamePacketListenerImpl
                                  boolean flag1 = this.player.verticalCollisionBelow;
                                  this.player.move(MoverType.PLAYER, new Vec3(d3, d4, d5));
                                  this.player.onGround = packet.isOnGround(); // CraftBukkit - SPIGOT-5810, SPIGOT-5835, SPIGOT-6828: reset by this.player.move
 +                                final boolean didCollide = toX != this.player.getX() || toY != this.player.getY() || toZ != this.player.getZ(); // Paper - needed here as the difference in Y can be reset - also note: this is only a guess at whether collisions took place, floating point errors can make this true when it shouldn't be...
                                  // Paper start - prevent position desync
                                  if (this.awaitingPositionFromClient != null) {
                                      return; // ... thanks Mojang for letting move calls teleport across dimensions.
-@@ -1581,7 +1615,17 @@ public class ServerGamePacketListenerImpl
+@@ -1574,7 +1608,17 @@ public class ServerGamePacketListenerImpl
                                  }
 
                                  // Paper start - Add fail move event
@@ -114,7 +114,7 @@ index 1c5750c258bfb4b551048670a5e73a19a813ec47..ad4d20dda67ffb37e15a1623104a6e23
                                  if (!allowMovement) {
                                      io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.CLIPPED_INTO_BLOCK,
                                              toX, toY, toZ, toYaw, toPitch, false);
-@@ -1716,7 +1760,7 @@ public class ServerGamePacketListenerImpl
+@@ -1709,7 +1753,7 @@ public class ServerGamePacketListenerImpl
 
      private boolean updateAwaitingTeleport() {
          if (this.awaitingPositionFromClient != null) {
@@ -123,7 +123,7 @@ index 1c5750c258bfb4b551048670a5e73a19a813ec47..ad4d20dda67ffb37e15a1623104a6e23
                  this.awaitingTeleportTime = this.tickCount;
                  this.teleport(
                      this.awaitingPositionFromClient.x,
-@@ -1735,6 +1779,34 @@ public class ServerGamePacketListenerImpl
+@@ -1728,6 +1772,34 @@ public class ServerGamePacketListenerImpl
          }
      }
 

paper-server/patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch

@@ -374,27 +374,14 @@
                  return;
              }
 
-@@ -536,12 +_,20 @@
+@@ -536,6 +_,7 @@
              this.lastGoodZ = this.awaitingPositionFromClient.z;
              this.player.hasChangedDimension();
              this.awaitingPositionFromClient = null;
 +            this.player.level().getChunkSource().move(this.player); // CraftBukkit
          }
      }
 
-     @Override
-     public void handleAcceptPlayerLoad(ServerboundPlayerLoadedPacket packet) {
-         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());
-+        // Paper start - PlayerLoadedWorldEvent
-+        if (this.hasClientLoaded()) {
-+            return;
-+        }
-+        final io.papermc.paper.event.player.PlayerClientLoadedWorldEvent event = new io.papermc.paper.event.player.PlayerClientLoadedWorldEvent(this.player.getBukkitEntity(), false);
-+        event.callEvent();
-+        // Paper end - PlayerLoadedWorldEvent
-         this.markClientLoaded();
-     }
- 
 @@ -563,6 +_,7 @@
      @Override
      public void handleRecipeBookChangeSettingsPacket(ServerboundRecipeBookChangeSettingsPacket packet) {
@@ -2581,29 +2568,27 @@
          if (!this.receivedMovementThisTick) {
              this.player.setKnownMovement(Vec3.ZERO);
          }
-@@ -2130,13 +_,21 @@
-     }
- 
-     public boolean hasClientLoaded() {
--        return !this.waitingForRespawn && this.clientLoadedTimeoutTimer <= 0;
-+        return !this.waitingForRespawn; // Paper - Add PlayerLoadedWorldEvent
+@@ -2134,12 +_,18 @@
      }
 
      public void tickClientLoadTimeout() {
-         if (this.clientLoadedTimeoutTimer > 0) {
+-        if (this.clientLoadedTimeoutTimer > 0) {
++        if (this.clientLoadedTimeoutTimer > 1) { // Paper - Add PlayerLoadedWorldEvent - only reduce till 1, let the below else-if call #markClientLoaded to trigger event and reduce to 0
              this.clientLoadedTimeoutTimer--;
-         }
+-        }
++        } else if (this.clientLoadedTimeoutTimer == 1) markClientLoaded(); // Paper - Add PlayerLoadedWorldEvent - decrement by calling #markClientLoaded which will set the value to 0 *and* call the event.
+     }
+ 
+     private void markClientLoaded() {
 +        // Paper start - Add PlayerLoadedWorldEvent
-+        if (this.clientLoadedTimeoutTimer <= 0) {
-+            this.waitingForRespawn = false;
-+
++        if (!hasClientLoaded()) {
 +            final io.papermc.paper.event.player.PlayerClientLoadedWorldEvent event = new io.papermc.paper.event.player.PlayerClientLoadedWorldEvent(this.player.getBukkitEntity(), true);
 +            event.callEvent();
 +        }
 +        // Paper end - Add PlayerLoadedWorldEvent
+         this.clientLoadedTimeoutTimer = 0;
      }
 
-     private void markClientLoaded() {
 @@ -2156,4 +_,80 @@
      interface EntityInteraction {
          InteractionResult run(ServerPlayer player, Entity entity, InteractionHand hand);