Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-03 14:22:09 +00:00
Code Issues Releases Activity

Update 1.19.4

Browse Source
This commit is contained in:
violetc
2023-03-19 17:30:46 +08:00
parent 2fe291360d
commit c67a637939
48 changed files with 342 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0046-BBOR-Protocol.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] BBOR Protocol
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 49d3483357981e2a980a6e39e1be27e118adde87..64ac23a34285328cf79550d31c7a4bbb55138de1 100644
index 3dc75d267340fdda50668ec0cc7270867dd96117..5a36cebb698ff296a057abb2745c60b41c243ad7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1585,6 +1585,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1594,6 +1594,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.popPush("server gui refresh");
@@ -18,10 +18,10 @@ index 49d3483357981e2a980a6e39e1be27e118adde87..64ac23a34285328cf79550d31c7a4bbb
for (int i = 0; i < this.tickables.size(); ++i) {
((Runnable) this.tickables.get(i)).run();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 2e762d02bc3f5d768e08a41f281b504ceb8d6996..d81d6697fd1524d73df631b76c39cf363e1c33ec 100644
index 3b158e65781758665baad82b049210c102679451..ec0568956dd2750e84512d0c1d1e85bb4159130f 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3557,6 +3557,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3571,6 +3571,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (top.leavesmc.leaves.LeavesConfig.pcaSyncProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.PcaSyncProtocol.PROTOCOL_ID)) {
top.leavesmc.leaves.protocol.PcaSyncProtocol.handlePacket(server, player, packet);
}
@@ -32,10 +32,10 @@ index 2e762d02bc3f5d768e08a41f281b504ceb8d6996..d81d6697fd1524d73df631b76c39cf36
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 70493b62ad4a7722b8823d8bdc3443d3367ac959..50833a1db2728131b6638a40236b81a219ed5f53 100644
index f818dadc0a6719389f535ec142d73d34d45c8aac..3032ae9cbf02f11329a3a29442e8eff1ac9be5e8 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -335,6 +335,7 @@ public abstract class PlayerList {
@@ -341,6 +341,7 @@ public abstract class PlayerList {
}
// Leaves end - bot support
top.leavesmc.leaves.protocol.PcaSyncProtocol.onJoin(player); // Leaves - pca
@@ -43,7 +43,7 @@ index 70493b62ad4a7722b8823d8bdc3443d3367ac959..50833a1db2728131b6638a40236b81a2
final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
@@ -577,6 +578,7 @@ public abstract class PlayerList {
@@ -584,6 +585,7 @@ public abstract class PlayerList {
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())));
}
public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
@@ -51,7 +51,7 @@ index 70493b62ad4a7722b8823d8bdc3443d3367ac959..50833a1db2728131b6638a40236b81a2
// Paper end
ServerLevel worldserver = entityplayer.getLevel();
@@ -1547,7 +1549,7 @@ public abstract class PlayerList {
@@ -1553,7 +1555,7 @@ public abstract class PlayerList {
entityplayer.connection.send(packetplayoutrecipeupdate);
entityplayer.getRecipeBook().sendInitialRecipeBook(entityplayer);
}
@@ -61,10 +61,10 @@ index 70493b62ad4a7722b8823d8bdc3443d3367ac959..50833a1db2728131b6638a40236b81a2
public boolean isAllowCheatsForAllPlayers() {
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 1bf1af06fbd6501e98def7997c487c425d6a1623..15f9978e9c1ccb7f64a5f43c564842f93836b1d7 100644
index 78dc041216f13bc9aaa9bef2aeba34601e7239da..228ca319cdf1dc0d853271cbfae510aa11203a1b 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -1050,6 +1050,11 @@ public class LevelChunk extends ChunkAccess {
@@ -1062,6 +1062,11 @@ public class LevelChunk extends ChunkAccess {
public void setLoaded(boolean loadedToWorld) {
this.loaded = loadedToWorld;
@@ -77,10 +77,10 @@ index 1bf1af06fbd6501e98def7997c487c425d6a1623..15f9978e9c1ccb7f64a5f43c564842f9
public Level getLevel() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8e9fb3731edc302ae472599f8e2d953d485a265e..0f639571f63adad7d2a738b7ce8dc0158cdeb0c6 100644
index 4ffa2d267778181d853f22ccfb66eb4869866aaf..92a6206841e80488b83dad00960d8daa29adc14d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -970,6 +970,13 @@ public final class CraftServer implements Server {
@@ -965,6 +965,13 @@ public final class CraftServer implements Server {
top.leavesmc.leaves.protocol.PcaSyncProtocol.disablePcaSyncProtocolGlobal();
}
// Leaves end - pca