Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-06 15:51:33 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2023-08-10 11:54:15 +08:00
parent 3ca346a4d7
commit 24b7527c62
14 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -4,5 +4,5 @@ version=1.20.1-R0.1-SNAPSHOT
mcVersion=1.20.1
packageVersion=1_20_R1
org.gradle.jvmargs=-Xmx2G
paperRef=d6d2b6f4e51b24867b609cf747ac6d8c6345c449
paperRef=4179b8f3fa86437aa1d9742930fd8ca6d23515a0
preVersion=false

4
patches/server/0002-Leaves-Server-Utils.patch
View File

@@ -31,7 +31,7 @@ index 46954db7ecd35ac4018fdf476df7c8020d7ce6c8..044c51ebb058fc36074fd178929e3279
public PlayerAreaMap() {
super();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 4c298406ce06d39f8279049270c88ec0830733b1..d92156a7ad34f7c8e9d43ea5472d33a5e1cd9fdd 100644
index 2edab21bb271405f200de5a19e9c748bb14aba7d..7469c4acb8b5fc47c87ba573232a996f464479e3 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -417,6 +417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -62,7 +62,7 @@ index 4c298406ce06d39f8279049270c88ec0830733b1..d92156a7ad34f7c8e9d43ea5472d33a5
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
@@ -4788,4 +4795,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4793,4 +4800,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end

4
patches/server/0016-No-chat-sign.patch
View File

@@ -123,10 +123,10 @@ index 27638ebb110f46f7e3d0255e3078ebb586863a30..9abc92d8c98c1075ebc74e9dc4290b88
protected boolean convertOldUsers() {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 75bd92e1d40588d3bc40fa7837943eec9f2062a6..bfa209eceee3da7fd2ada1e1b1e5e11076c80576 100644
index 80e050603e36134754136a8ee2bd14624f976e91..eb5fc12c50690c59146cc0c9c59682b525620316 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2147,10 +2147,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2188,10 +2188,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void send(Packet<?> packet) {

6
patches/server/0040-Reduce-entity-fluid-lookups-if-no-fluids.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Reduce entity fluid lookups if no fluids
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index aea1ba7ff85a95a7554bb7102684d5bf9ebfbaa2..0d674998a3d17eb63e32e350b3a235d7df3d186a 100644
index 65d7df9a78f3880037b4b2becafee203d6a8833d..e314e572c05a12cfeb90be501d491765aaa33557 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4294,16 +4294,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4299,16 +4299,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -35,7 +35,7 @@ index aea1ba7ff85a95a7554bb7102684d5bf9ebfbaa2..0d674998a3d17eb63e32e350b3a235d7
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4311,38 +4313,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4316,38 +4318,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();

6
patches/server/0043-PCA-sync-protocol.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] PCA sync protocol
This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index bfa209eceee3da7fd2ada1e1b1e5e11076c80576..8df2ca4bc3718d127be9a2adccb47a36bba13570 100644
index eb5fc12c50690c59146cc0c9c59682b525620316..292b60916091e544d87311afb16258c00c71c5c3 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -247,6 +247,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -17,7 +17,7 @@ index bfa209eceee3da7fd2ada1e1b1e5e11076c80576..8df2ca4bc3718d127be9a2adccb47a36
// CraftBukkit end
public class ServerGamePacketListenerImpl implements ServerPlayerConnection, TickablePacketListener, ServerGamePacketListener {
@@ -3581,6 +3582,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3622,6 +3623,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
}
} else {
@@ -343,7 +343,7 @@ index b7686fd63b7c5d88c3a12ec4ee9bc01a17f997e0..25a9c38c60d183bb65b14f4d7550ab98
public int[] getSlotsForFace(Direction side) {
return ShulkerBoxBlockEntity.SLOTS;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 162c494792cd2e794693e4ded4872bcccc592679..f0beb8925cc7d5e1f8bd776735a36707ac06703a 100644
index 136168dd1d1aaa8357f1e4b7e4b3bbf1ae705ea8..b74b3a257eeb877468498e5d2cba8ad6c5381548 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -468,6 +468,7 @@ public final class CraftServer implements Server {

6
patches/server/0044-BBOR-Protocol.patch
View File

@@ -18,10 +18,10 @@ index a93018a2797bc1a1c134f810eaa067d0a0b4bb8a..41fcf8abe96be28cdc79eba6eebe753d
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 8df2ca4bc3718d127be9a2adccb47a36bba13570..502902730fc62e2eb6bb4f0e6a225dd6808614d0 100644
index 292b60916091e544d87311afb16258c00c71c5c3..7c480370311360a2ee23046e2ec91af714177a54 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3587,6 +3587,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3628,6 +3628,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);
}
@@ -77,7 +77,7 @@ 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 f0beb8925cc7d5e1f8bd776735a36707ac06703a..89896848635f245ca62f583c924ddbb1a3e2cf84 100644
index b74b3a257eeb877468498e5d2cba8ad6c5381548..11d44bdb1f9be5f681e1e8e892fd54e5e9c78e6c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1068,6 +1068,13 @@ public final class CraftServer implements Server {

6
patches/server/0047-Jade-Protocol.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Jade Protocol
This patch is Powered by Jade(https://github.com/Snownee/Jade)
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 502902730fc62e2eb6bb4f0e6a225dd6808614d0..92fcb5d707bb17672e2941ec59d5548fb23044c0 100644
index 7c480370311360a2ee23046e2ec91af714177a54..3d77af234f5035b391717679f1e93d8965dc7a13 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3590,6 +3590,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3631,6 +3631,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (top.leavesmc.leaves.LeavesConfig.bborProtocol && packet.identifier.equals(top.leavesmc.leaves.protocol.BBORProtocol.SUBSCRIBE)) {
top.leavesmc.leaves.protocol.BBORProtocol.onPlayerSubscribed(player);
}
@@ -45,7 +45,7 @@ index 4aeab90e778629c355189dfe79c39c4b21f5f5ac..fe8c9b7e7956837829b4fe3eb449b2c0
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 89896848635f245ca62f583c924ddbb1a3e2cf84..0869a0e65c778f185a7a3512438172b1088ff678 100644
index 11d44bdb1f9be5f681e1e8e892fd54e5e9c78e6c..94378e73b4da268b46f2918c61ad700ac14fe951 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -469,6 +469,7 @@ public final class CraftServer implements Server {

6
patches/server/0061-Syncmatica-Protocol.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Syncmatica Protocol
This patch is Powered by Syncmatica(https://github.com/End-Tech/syncmatica)
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 92fcb5d707bb17672e2941ec59d5548fb23044c0..9a572268cc17fc1179dc447e20c4bab38f24b773 100644
index 3d77af234f5035b391717679f1e93d8965dc7a13..30ed248d933ef31af041ccbf60f57cdbde97b91c 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -324,6 +324,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -31,7 +31,7 @@ index 92fcb5d707bb17672e2941ec59d5548fb23044c0..9a572268cc17fc1179dc447e20c4bab3
@Override
public void tick() {
if (this.ackBlockChangesUpTo > -1) {
@@ -2113,6 +2121,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2154,6 +2162,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.processedDisconnect = true;
}
// CraftBukkit end
@@ -43,7 +43,7 @@ index 92fcb5d707bb17672e2941ec59d5548fb23044c0..9a572268cc17fc1179dc447e20c4bab3
this.chatMessageChain.close();
ServerGamePacketListenerImpl.LOGGER.info("{} lost connection: {}", this.player.getName().getString(), reason.getString());
// CraftBukkit start - Replace vanilla quit message handling with our own.
@@ -3593,6 +3606,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3634,6 +3647,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (top.leavesmc.leaves.LeavesConfig.jadeProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.JadeProtocol.PROTOCOL_ID)) {
top.leavesmc.leaves.protocol.JadeProtocol.handlePacket(server, player, packet);
}

4
patches/server/0063-Disable-distance-check-for-UseItemOnPacket.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable distance check for UseItemOnPacket
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 9a572268cc17fc1179dc447e20c4bab38f24b773..ab8d7d42a4c86a58d1e37f90d1c3c08321d14525 100644
index 30ed248d933ef31af041ccbf60f57cdbde97b91c..873e0c1e8aff83eb65e4fe82dd51c58412f32db4 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1959,7 +1959,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2000,7 +2000,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
Vec3 vec3d2 = vec3d.subtract(vec3d1);
double d0 = 1.0000001D;

4
patches/server/0068-Disable-check-out-of-order-command.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable check out-of-order command
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index ab8d7d42a4c86a58d1e37f90d1c3c08321d14525..33b807b3d00f3143948852cf7d29320285694e6e 100644
index 873e0c1e8aff83eb65e4fe82dd51c58412f32db4..30b806329d450f5fe4e10862176360d09116efe0 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2363,7 +2363,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2404,7 +2404,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {

4
patches/server/0070-Leaves-carpet-support.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves carpet support
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 33b807b3d00f3143948852cf7d29320285694e6e..55b620c3dfea942f1d8d9ba4eddd54934c1ae443 100644
index 30b806329d450f5fe4e10862176360d09116efe0..eb46b1376c8d9bd81734811d9e27cfa0f4572f2d 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3609,6 +3609,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3650,6 +3650,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (top.leavesmc.leaves.LeavesConfig.syncmaticaProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.syncmatica.SyncmaticaProtocol.PROTOCOL_ID)) {
top.leavesmc.leaves.protocol.syncmatica.SyncmaticaProtocol.getCommunicationManager().onPacketGet(packet, this);
}

4
patches/server/0078-Bladeren-mspt-sync-protocol.patch
View File

@@ -17,10 +17,10 @@ index 16fd5af5f0f5018f87bf143926b6ec6b4bfc1a76..87bb9de0403339d3f14fa9065d0a0515
MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper
for (int i = 0; i < this.tickables.size(); ++i) {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 93613d0aef1a05fa77e079478e464d46379e52af..172eaa332d1bb89b98c9518275909c5c494bf84a 100644
index 192f9cff213b01df280d5bdc9b8eef45d841b8f0..733b50fc4e4170c16175146f3f8067831ab69d30 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3612,6 +3612,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3653,6 +3653,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (top.leavesmc.leaves.LeavesConfig.leavesCarpetSupport && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.CarpetServerProtocol.PROTOCOL_ID)) {
top.leavesmc.leaves.protocol.CarpetServerProtocol.handlePacket(player, packet);
}

4
patches/server/0099-Reduce-array-allocations.patch
View File

@@ -266,7 +266,7 @@ index c47df8d18be8ac7d32a16e6662dbbd850efc8e8a..709229d6226464d2a0bc773a3916c811
return ret;
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 172eaa332d1bb89b98c9518275909c5c494bf84a..6e816c8f8dc3235c256a579b48914b0cd03170a8 100644
index 733b50fc4e4170c16175146f3f8067831ab69d30..b932ccd51d336f138103549026c9b178e46ab62b 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -249,6 +249,7 @@ import org.bukkit.inventory.InventoryView;
@@ -302,7 +302,7 @@ index 172eaa332d1bb89b98c9518275909c5c494bf84a..6e816c8f8dc3235c256a579b48914b0c
return;
}
// Paper end
@@ -3326,7 +3327,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3367,7 +3368,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
// Paper start
if (!org.bukkit.Bukkit.isPrimaryThread()) {
if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {

4
patches/server/0107-Skip-entity-move-if-movement-is-zero.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Skip entity move if movement is zero
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 70b62bffa6defd2207f69f38fecaa99760bc2bbd..aeb86eb3362893e54e0bf28ab36cdf4d2eea6c31 100644
index 570ee65b43a08f6f1846192b71660f0ed4c5b447..ab063e4a3fcdb402dfedac90b8b5ec4336021be3 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -314,6 +314,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -31,7 +31,7 @@ index 70b62bffa6defd2207f69f38fecaa99760bc2bbd..aeb86eb3362893e54e0bf28ab36cdf4d
// Paper start - detailed watchdog information
io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
synchronized (this.posLock) {
@@ -3987,6 +3995,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3992,6 +4000,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public final void setBoundingBox(AABB boundingBox) {