Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-23 17:09:26 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2023-08-06 12:17:09 +08:00
parent 0d94a3b79c
commit 31672c178f
21 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,7 +223,7 @@ index cf20f0983fc25b26cf92b9d3a28746b1909fc56b..c8d62a76bfa1a54b6ecb23f0d53ba2db
}
// Paper start
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index 691158e71b06c66ae576c6e9b53caf23d1747330..b840dbdd83eb985615f7de02439ae474dd1afe01 100644
index 99aa4e9363d5b00c397e3cddc21c341f35812ba4..67105a6bbe39a38805dcf5ee026ec1269069c53a 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -351,7 +351,7 @@ public class ServerEntity {
@@ -266,10 +266,10 @@ 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 77f20c1e37ce6c271a7f060bab04324d6b748136..18f6eaefb4db548c08afb053ef7df37890036141 100644
index 172eaa332d1bb89b98c9518275909c5c494bf84a..6e816c8f8dc3235c256a579b48914b0cd03170a8 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.InventoryView;
@@ -249,6 +249,7 @@ import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.SmithingInventory;
import top.leavesmc.leaves.util.ProtocolUtils;
// CraftBukkit end
@@ -277,7 +277,7 @@ index 77f20c1e37ce6c271a7f060bab04324d6b748136..18f6eaefb4db548c08afb053ef7df378
public class ServerGamePacketListenerImpl implements ServerPlayerConnection, TickablePacketListener, ServerGamePacketListener {
@@ -413,7 +414,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -415,7 +416,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (this.keepAlivePending) {
if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
@@ -286,7 +286,7 @@ index 77f20c1e37ce6c271a7f060bab04324d6b748136..18f6eaefb4db548c08afb053ef7df378
}
} else {
if (elapsedTime >= 15000L) { // 15 seconds
@@ -892,13 +893,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -894,13 +895,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
// PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // Paper - run this async
// CraftBukkit start
if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable
@@ -302,7 +302,7 @@ index 77f20c1e37ce6c271a7f060bab04324d6b748136..18f6eaefb4db548c08afb053ef7df378
return;
}
// Paper end
@@ -3327,7 +3328,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3326,7 +3327,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) {
@@ -346,7 +346,7 @@ index 2ff578e4a953ffcf5176815ba8e3f06f73499989..bf082b9c3947d6037328526e5bfafe2b
final String s;
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index fc9b8f6e9dbef606ade0f2376a8187ae4ca366cb..16670088947fe126674fa9058f4fc8df01546a2c 100644
index 8c3e87e3510ab048c206c974ec154e5b59c7342b..3ff61af745630dc692d84aeccc25ad8dcf5c5746 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -134,6 +134,7 @@ import org.bukkit.event.player.PlayerRespawnEvent.RespawnReason;
@@ -482,10 +482,10 @@ index 25ed5571b24e590bc95056020d84496492b53298..89d7364bc645a8b9217e87780cdc0ced
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index c865979ecce94e02d16f2f4d4d6be16fd5815b6c..0f4ec67c1660755f268c527a96cb8030e8830ec9 100644
index fac8de87a096e2f3ba71fc4043acf66491c5b62b..eaa5d29c3e4c32db21cc72295551d81b65e274b7 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -1015,7 +1015,7 @@ public final class ItemStack {
@@ -1019,7 +1019,7 @@ public final class ItemStack {
int k;
if (ItemStack.shouldShowInTooltip(i, ItemStack.TooltipPart.MODIFIERS)) {