Fix Player.setPlayerListOrder to send update to clients (#11729)

43 files changed, 29 insertions, 4 deletions

diff --git a/patches/server/1034-Fix-Player.setPlayerListOrder-to-send-update-to-clie.patch b/patches/server/1034-Fix-Player.setPlayerListOrder-to-send-update-to-clie.patch
new file mode 100644
index 0000000000..a42c19217e
--- /dev/null
+++ b/patches/server/1034-Fix-Player.setPlayerListOrder-to-send-update-to-clie.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: 96DarkCode96 <[email protected]>
+Date: Tue, 10 Dec 2024 15:45:47 +0100
+Subject: [PATCH] Fix Player.setPlayerListOrder to send update to clients
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index d5dc10cf9440f2394e6548c6a3e0160df13c9cae..e9df37ff66700278bc94ea1e42135b92d97d03f7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -606,6 +606,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         Preconditions.checkArgument(order >= 0, "order cannot be negative");
+ 
+         this.getHandle().listOrder = order;
++        // Paper start - Send update packet
++        if (getHandle().connection == null) return; // Updates are possible before the player has fully joined
++        for (ServerPlayer player : server.getHandle().players) {
++            if (player.getBukkitEntity().canSee(this)) {
++                player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_LIST_ORDER, getHandle()));
++            }
++        }
++        // Paper end - Send update packet
+     }
+ 
+     private net.kyori.adventure.text.Component playerListHeader; // Paper - Adventure
diff --git a/patches/server/1034-Fix-incorrect-command-serialization-by-creating-new-.patch b/patches/server/1035-Fix-incorrect-command-serialization-by-creating-new-.patch
index e58c07dc45..e58c07dc45 100644
--- a/patches/server/1034-Fix-incorrect-command-serialization-by-creating-new-.patch
+++ b/patches/server/1035-Fix-incorrect-command-serialization-by-creating-new-.patch
diff --git a/patches/server/1035-Properly-resend-entities.patch b/patches/server/1036-Properly-resend-entities.patch
index 66c3b79aa0..66c3b79aa0 100644
--- a/patches/server/1035-Properly-resend-entities.patch
+++ b/patches/server/1036-Properly-resend-entities.patch
diff --git a/patches/server/1036-Switch-Impl-types-to-Holderable.patch b/patches/server/1037-Switch-Impl-types-to-Holderable.patch
index b695639796..b695639796 100644
--- a/patches/server/1036-Switch-Impl-types-to-Holderable.patch
+++ b/patches/server/1037-Switch-Impl-types-to-Holderable.patch
diff --git a/patches/server/1037-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/1038-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 4e08c4e606..4e08c4e606 100644
--- a/patches/server/1037-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/1038-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/1038-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/1039-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 73fea5a3cb..73fea5a3cb 100644
--- a/patches/server/1038-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/1039-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/1039-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/1040-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 964b69d8d4..964b69d8d4 100644
--- a/patches/server/1039-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/1040-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/1040-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/1041-Allow-Saving-of-Oversized-Chunks.patch
index 0b77f00d70..0b77f00d70 100644
--- a/patches/server/1040-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/1041-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/1041-Flat-bedrock-generator-settings.patch b/patches/server/1042-Flat-bedrock-generator-settings.patch
index 5084ca1e6b..5084ca1e6b 100644
--- a/patches/server/1041-Flat-bedrock-generator-settings.patch
+++ b/patches/server/1042-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/1042-Entity-Activation-Range-2.0.patch b/patches/server/1043-Entity-Activation-Range-2.0.patch
index ac96166e5a..ac96166e5a 100644
--- a/patches/server/1042-Entity-Activation-Range-2.0.patch
+++ b/patches/server/1043-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/1043-Anti-Xray.patch b/patches/server/1044-Anti-Xray.patch
index ad4fd2c07d..ad4fd2c07d 100644
--- a/patches/server/1043-Anti-Xray.patch
+++ b/patches/server/1044-Anti-Xray.patch
diff --git a/patches/server/1044-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1045-Use-Velocity-compression-and-cipher-natives.patch
index 4fe3d49978..4fe3d49978 100644
--- a/patches/server/1044-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/1045-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1045-Optimize-Collision-to-not-load-chunks.patch b/patches/server/1046-Optimize-Collision-to-not-load-chunks.patch
index fd4a0f3fb7..fd4a0f3fb7 100644
--- a/patches/server/1045-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/1046-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/1046-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/1047-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 04866c7805..04866c7805 100644
--- a/patches/server/1046-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/1047-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/1047-Optimize-Hoppers.patch b/patches/server/1048-Optimize-Hoppers.patch
index 28044def80..28044def80 100644
--- a/patches/server/1047-Optimize-Hoppers.patch
+++ b/patches/server/1048-Optimize-Hoppers.patch
diff --git a/patches/server/1048-Optimize-Voxel-Shape-Merging.patch b/patches/server/1049-Optimize-Voxel-Shape-Merging.patch
index 52246713b3..52246713b3 100644
--- a/patches/server/1048-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/1049-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1049-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1050-Optimize-Bit-Operations-by-inlining.patch
index 63fe402931..63fe402931 100644
--- a/patches/server/1049-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/1050-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1050-Remove-streams-from-hot-code.patch b/patches/server/1051-Remove-streams-from-hot-code.patch
index e6f8c4dd49..e6f8c4dd49 100644
--- a/patches/server/1050-Remove-streams-from-hot-code.patch
+++ b/patches/server/1051-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1051-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1052-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index b32ebf6b4e..b32ebf6b4e 100644
--- a/patches/server/1051-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/1052-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1052-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1053-Fix-entity-type-tags-suggestions-in-selectors.patch
index c59b899479..c59b899479 100644
--- a/patches/server/1052-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1053-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1053-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1054-Handle-Oversized-block-entities-in-chunks.patch
index d3283fd63f..d3283fd63f 100644
--- a/patches/server/1053-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/1054-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1054-Check-distance-in-entity-interactions.patch b/patches/server/1055-Check-distance-in-entity-interactions.patch
index 7e7ea01bc1..7e7ea01bc1 100644
--- a/patches/server/1054-Check-distance-in-entity-interactions.patch
+++ b/patches/server/1055-Check-distance-in-entity-interactions.patch
diff --git a/patches/server/1055-optimize-dirt-and-snow-spreading.patch b/patches/server/1056-optimize-dirt-and-snow-spreading.patch
index bdf5b94547..bdf5b94547 100644
--- a/patches/server/1055-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/1056-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1056-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/1057-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index a18ef75e66..a18ef75e66 100644
--- a/patches/server/1056-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/1057-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/1057-Rewrite-dataconverter-system.patch b/patches/server/1058-Rewrite-dataconverter-system.patch
index 63a36045f0..63a36045f0 100644
--- a/patches/server/1057-Rewrite-dataconverter-system.patch
+++ b/patches/server/1058-Rewrite-dataconverter-system.patch
diff --git a/patches/server/1058-Moonrise-optimisation-patches.patch b/patches/server/1059-Moonrise-optimisation-patches.patch
index 4524413236..7f86f8c5a1 100644
--- a/patches/server/1058-Moonrise-optimisation-patches.patch
+++ b/patches/server/1059-Moonrise-optimisation-patches.patch
@@ -36227,10 +36227,10 @@ index ca62105a0ff0aa69385cbf2018f8fe6a4bb69fd4..92d9f0ea8f7810ae20d3996f49aefa53
  
      // Paper start - implement pointers
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d5dc10cf9440f2394e6548c6a3e0160df13c9cae..20f64850cb42d986358f01ffcdb42187e1684bca 100644
+index e9df37ff66700278bc94ea1e42135b92d97d03f7..6a647cab8b2e476987931486e290703b8726f2c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3519,7 +3519,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3527,7 +3527,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setViewDistance(final int viewDistance) {
@@ -36241,7 +36241,7 @@ index d5dc10cf9440f2394e6548c6a3e0160df13c9cae..20f64850cb42d986358f01ffcdb42187
      }
  
      @Override
-@@ -3529,7 +3531,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3537,7 +3539,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setSimulationDistance(final int simulationDistance) {
@@ -36252,7 +36252,7 @@ index d5dc10cf9440f2394e6548c6a3e0160df13c9cae..20f64850cb42d986358f01ffcdb42187
      }
  
      @Override
-@@ -3539,7 +3543,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3547,7 +3551,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setSendViewDistance(final int viewDistance) {
diff --git a/patches/server/1059-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/1060-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index c155a5cca2..c155a5cca2 100644
--- a/patches/server/1059-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/1060-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/1060-Improved-Watchdog-Support.patch b/patches/server/1061-Improved-Watchdog-Support.patch
index 150860a96e..150860a96e 100644
--- a/patches/server/1060-Improved-Watchdog-Support.patch
+++ b/patches/server/1061-Improved-Watchdog-Support.patch
diff --git a/patches/server/1061-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1062-Detail-more-information-in-watchdog-dumps.patch
index fafa3413d0..fafa3413d0 100644
--- a/patches/server/1061-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1062-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/1062-Entity-load-save-limit-per-chunk.patch b/patches/server/1063-Entity-load-save-limit-per-chunk.patch
index e69171236b..e69171236b 100644
--- a/patches/server/1062-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/1063-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1063-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1064-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 5c9944447a..5c9944447a 100644
--- a/patches/server/1063-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1064-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1064-Improve-performance-of-mass-crafts.patch b/patches/server/1065-Improve-performance-of-mass-crafts.patch
index 57f901bc5f..57f901bc5f 100644
--- a/patches/server/1064-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1065-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1065-Incremental-chunk-and-player-saving.patch b/patches/server/1066-Incremental-chunk-and-player-saving.patch
index d0f88ba05d..d0f88ba05d 100644
--- a/patches/server/1065-Incremental-chunk-and-player-saving.patch
+++ b/patches/server/1066-Incremental-chunk-and-player-saving.patch
diff --git a/patches/server/1066-Optimise-general-POI-access.patch b/patches/server/1067-Optimise-general-POI-access.patch
index 79a34afd5a..79a34afd5a 100644
--- a/patches/server/1066-Optimise-general-POI-access.patch
+++ b/patches/server/1067-Optimise-general-POI-access.patch
diff --git a/patches/server/1067-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/1068-Fix-entity-tracker-desync-when-new-players-are-added.patch
index b8cbd694c2..b8cbd694c2 100644
--- a/patches/server/1067-Fix-entity-tracker-desync-when-new-players-are-added.patch
+++ b/patches/server/1068-Fix-entity-tracker-desync-when-new-players-are-added.patch
diff --git a/patches/server/1068-Lag-compensation-ticks.patch b/patches/server/1069-Lag-compensation-ticks.patch
index e066509147..e066509147 100644
--- a/patches/server/1068-Lag-compensation-ticks.patch
+++ b/patches/server/1069-Lag-compensation-ticks.patch
diff --git a/patches/server/1069-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1070-Optimise-collision-checking-in-player-move-packet-ha.patch
index 317ca38fea..317ca38fea 100644
--- a/patches/server/1069-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/1070-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1070-Optional-per-player-mob-spawns.patch b/patches/server/1071-Optional-per-player-mob-spawns.patch
index 16376dd6f8..16376dd6f8 100644
--- a/patches/server/1070-Optional-per-player-mob-spawns.patch
+++ b/patches/server/1071-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/1071-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/1072-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 57ae223711..57ae223711 100644
--- a/patches/server/1071-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/1072-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/1072-Eigencraft-redstone-implementation.patch b/patches/server/1073-Eigencraft-redstone-implementation.patch
index 8ea799e5f8..8ea799e5f8 100644
--- a/patches/server/1072-Eigencraft-redstone-implementation.patch
+++ b/patches/server/1073-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1073-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1074-Add-Alternate-Current-redstone-implementation.patch
index 740ec46169..740ec46169 100644
--- a/patches/server/1073-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/1074-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1074-Improve-exact-choice-recipe-ingredients.patch b/patches/server/1075-Improve-exact-choice-recipe-ingredients.patch
index 88c45348a2..88c45348a2 100644
--- a/patches/server/1074-Improve-exact-choice-recipe-ingredients.patch
+++ b/patches/server/1075-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/1075-Implement-chunk-view-API.patch b/patches/server/1076-Implement-chunk-view-API.patch
index 7e6fbf27c8..7e6fbf27c8 100644
--- a/patches/server/1075-Implement-chunk-view-API.patch
+++ b/patches/server/1076-Implement-chunk-view-API.patch