Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-30 12:29:18 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2023-08-23 13:24:24 +08:00
parent 8e737d4606
commit 1da94abde2
47 changed files with 268 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0117-Replay-Mod-API.patch
View File

@@ -115,7 +115,7 @@ index fd9e85dab7c511873824cac56a270ff435792292..257e51570ed08660613895f5a1eccbee
}
// Leaves end - bot can't get advancement
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 3ff61af745630dc692d84aeccc25ad8dcf5c5746..32daf27565b1466f5f6645b9f5bbc4f00fe0cc3e 100644
index 5718574a8a258a9a11417667b3373b4631a1211c..2f1c56de20a77d7ca5f424148cbc63019761438d 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -136,6 +136,7 @@ import org.bukkit.event.player.PlayerSpawnChangeEvent;
@@ -251,7 +251,7 @@ index 3ff61af745630dc692d84aeccc25ad8dcf5c5746..32daf27565b1466f5f6645b9f5bbc4f0
this.playersByName.put(player.getScoreboardName().toLowerCase(java.util.Locale.ROOT), player); // Spigot
this.playersByUUID.put(player.getUUID(), player);
// this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer))); // CraftBukkit - replaced with loop below
@@ -392,6 +497,12 @@ public abstract class PlayerList {
@@ -400,6 +505,12 @@ public abstract class PlayerList {
continue;
}
@@ -264,7 +264,7 @@ index 3ff61af745630dc692d84aeccc25ad8dcf5c5746..32daf27565b1466f5f6645b9f5bbc4f0
onlinePlayers.add(entityplayer1); // Paper - use single player info update packet
}
// Paper start - use single player info update packet
@@ -606,6 +717,43 @@ public abstract class PlayerList {
@@ -614,6 +725,43 @@ public abstract class PlayerList {
}
@@ -308,7 +308,7 @@ index 3ff61af745630dc692d84aeccc25ad8dcf5c5746..32daf27565b1466f5f6645b9f5bbc4f0
public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer) { // CraftBukkit - return string // Paper - return Component
// Paper start
return this.remove(entityplayer, net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : PaperAdventure.asAdventure(entityplayer.getDisplayName())));
@@ -676,6 +824,7 @@ public abstract class PlayerList {
@@ -684,6 +832,7 @@ public abstract class PlayerList {
entityplayer.retireScheduler(); // Paper - Folia schedulers
entityplayer.getAdvancements().stopListening();
this.players.remove(entityplayer);
@@ -317,7 +317,7 @@ index 3ff61af745630dc692d84aeccc25ad8dcf5c5746..32daf27565b1466f5f6645b9f5bbc4f0
this.server.getCustomBossEvents().onPlayerDisconnect(entityplayer);
UUID uuid = entityplayer.getUUID();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3948b88cf2fb407ebf228de93d42330ff1df0634..6bd1ef55b2d171025132ccb158fe51638267f28c 100644
index 47b27712c6ed11fc5c2cd7de04482870207545e7..0644273b83226d5a794e8d9517254b4c1febdfdd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -261,6 +261,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -345,7 +345,7 @@ index 3948b88cf2fb407ebf228de93d42330ff1df0634..6bd1ef55b2d171025132ccb158fe5163
@Override
public CraftPlayer apply(ServerPlayer player) {
return player.getBukkitEntity();
@@ -3163,4 +3165,11 @@ public final class CraftServer implements Server {
@@ -3193,4 +3195,11 @@ public final class CraftServer implements Server {
return botManager;
}
// Leaves end - Bot API
@@ -358,7 +358,7 @@ index 3948b88cf2fb407ebf228de93d42330ff1df0634..6bd1ef55b2d171025132ccb158fe5163
+ // Leaves end - replay mod api
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 9d6b1550302eb552872d91380e79ac28716ebb83..78b1303996078493a0787135691479d05af1d52e 100644
index 8388c2a56cbe531cf5f60a18866c85fad1e23c54..bdd36d58c55a66a9538540fa5c88a2943f1c7b05 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -198,6 +198,8 @@ import top.leavesmc.leaves.bot.ServerBot;