9
0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-27 02:49:10 +00:00

Update Paper

This commit is contained in:
violetc
2023-06-20 14:07:50 +08:00
parent 718ef0b5c9
commit b2a0889cda
25 changed files with 90 additions and 90 deletions

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 3332066fc16ec9f11fe35cfc3ea077723de2e110..28dea3a47773ea65d92eb427632603d965c03f2c 100644
index 34c86a70cab204e46c99f714c497c4bc1028196d..e8dcbd9b8bc3e5d456da4499b151c51fc474c4a8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1587,6 +1587,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1599,6 +1599,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.popPush("server gui refresh");
@@ -18,10 +18,10 @@ index 3332066fc16ec9f11fe35cfc3ea077723de2e110..28dea3a47773ea65d92eb427632603d9
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 0d19bbd8219508db5ce62851c31be8254c7ec417..b06ce9fe26cfec83e4f0509b72f2499da42e6970 100644
index adae87a679f8bd6d42d472b56cdc0a7806bc9910..551da6f66a319a62c800ea899d27ae7783269136 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3553,6 +3553,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3554,6 +3554,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,7 +32,7 @@ index 0d19bbd8219508db5ce62851c31be8254c7ec417..b06ce9fe26cfec83e4f0509b72f2499d
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 23a20843ef15f10db15f6bba8574149d3978208e..0a75f88b9f00a78cce117d73813498aeca920e6c 100644
index 160b58c31ab420ebd7bdc57b87e4dbb1d28e0ef3..666d7e33a26bc973fa87561503f032ec7f61bd0b 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -357,6 +357,7 @@ public abstract class PlayerList {
@@ -51,7 +51,7 @@ index 23a20843ef15f10db15f6bba8574149d3978208e..0a75f88b9f00a78cce117d73813498ae
// Paper end
ServerLevel worldserver = entityplayer.serverLevel();
@@ -1569,7 +1571,7 @@ public abstract class PlayerList {
@@ -1570,7 +1572,7 @@ public abstract class PlayerList {
entityplayer.connection.send(packetplayoutrecipeupdate);
entityplayer.getRecipeBook().sendInitialRecipeBook(entityplayer);
}
@@ -77,10 +77,10 @@ index cc224af0139a6e3adefd22cbfa0cd519735b7191..2c3ca05644bc97d505e8ca92e7a5f486
public Level getLevel() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 589ead0bc80f4b778fea790c0537003fb79518f1..89c6141f0568a30b92ec2ba94f635e675f0c61e2 100644
index c7f113730842f643b5c764d32e8c30d6df73648d..2ef8eac38e5136defacc8904480a21d2bd20b325 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -992,6 +992,13 @@ public final class CraftServer implements Server {
@@ -1062,6 +1062,13 @@ public final class CraftServer implements Server {
top.leavesmc.leaves.protocol.PcaSyncProtocol.disablePcaSyncProtocolGlobal();
}
// Leaves end - pca