From 64dc2be7fa5c9c128c0f75c7500b8f0d5cf08c56 Mon Sep 17 00:00:00 2001 From: MC_XiaoHei Date: Fri, 4 Jul 2025 19:33:54 +0800 Subject: [PATCH] fix replay api --- .../features/0074-Replay-Mod-API.patch | 13 ++++++++++--- .../features/0098-Bytebuf-API.patch | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/leaves-server/minecraft-patches/features/0074-Replay-Mod-API.patch b/leaves-server/minecraft-patches/features/0074-Replay-Mod-API.patch index c93ae918..ce38c3bb 100644 --- a/leaves-server/minecraft-patches/features/0074-Replay-Mod-API.patch +++ b/leaves-server/minecraft-patches/features/0074-Replay-Mod-API.patch @@ -142,7 +142,7 @@ index 4a34e43d5471bb12ef2535a1a9246376310c56f1..d50d0874aa34578af3ff8a6bb7c889ba } // Leaves end - skip diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index e74ca7f4c98590941fe88935d9fea0917c7b5c50..769010299668550ddca53deda5dfdcd679f5767c 100644 +index 318ce28d0eb6373ecfb2f15d210085f8156ff8c7..de411c04a010d8d2b091b9060d42d4074a6712c8 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -130,6 +130,7 @@ public abstract class PlayerList { @@ -153,7 +153,7 @@ index e74ca7f4c98590941fe88935d9fea0917c7b5c50..769010299668550ddca53deda5dfdcd6 // CraftBukkit start private org.bukkit.craftbukkit.CraftServer cserver; -@@ -148,6 +149,126 @@ public abstract class PlayerList { +@@ -148,6 +149,125 @@ public abstract class PlayerList { abstract public void loadAndSaveFiles(); // Paper - fix converting txt to json file; moved from DedicatedPlayerList constructor @@ -199,7 +199,6 @@ index e74ca7f4c98590941fe88935d9fea0917c7b5c50..769010299668550ddca53deda5dfdcd6 + } + + this.players.add(player); -+ this.realPlayers.add(player); // Leaves - replay api + this.playersByName.put(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT), player); // Spigot + this.playersByUUID.put(player.getUUID(), player); + @@ -280,6 +279,14 @@ index e74ca7f4c98590941fe88935d9fea0917c7b5c50..769010299668550ddca53deda5dfdcd6 public void placeNewPlayer(Connection connection, ServerPlayer player, CommonListenerCookie cookie) { player.isRealPlayer = true; // Paper player.loginTime = System.currentTimeMillis(); // Paper - Replace OfflinePlayer#getLastPlayed +@@ -310,6 +430,7 @@ public abstract class PlayerList { + + // player.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players)); // CraftBukkit - replaced with loop below + this.players.add(player); ++ this.realPlayers.add(player); // Leaves - replay api + this.playersByName.put(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT), player); // Spigot + this.playersByUUID.put(player.getUUID(), player); + // this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(player))); // CraftBukkit - replaced with loop below @@ -517,6 +638,43 @@ public abstract class PlayerList { } } diff --git a/leaves-server/minecraft-patches/features/0098-Bytebuf-API.patch b/leaves-server/minecraft-patches/features/0098-Bytebuf-API.patch index 6616add9..533baada 100644 --- a/leaves-server/minecraft-patches/features/0098-Bytebuf-API.patch +++ b/leaves-server/minecraft-patches/features/0098-Bytebuf-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Bytebuf API diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index 968a6bbff3540d781c0925a0db96c0492283d1f2..0d511f3dbb6c41c4ca152303123f3bc2dd90cbbc 100644 +index de411c04a010d8d2b091b9060d42d4074a6712c8..1d370d5fc9f69bcf2f7087373e9b53fbac792821 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java -@@ -385,6 +385,13 @@ public abstract class PlayerList { +@@ -384,6 +384,13 @@ public abstract class PlayerList { boolean _boolean = gameRules.getBoolean(GameRules.RULE_DO_IMMEDIATE_RESPAWN); boolean _boolean1 = gameRules.getBoolean(GameRules.RULE_REDUCEDDEBUGINFO); boolean _boolean2 = gameRules.getBoolean(GameRules.RULE_LIMITED_CRAFTING);