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

Update Paper

Browse Source
This commit is contained in:
violetc
2024-10-18 19:19:26 +08:00
parent b33c46c635
commit f830919563
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0080-Reduce-array-allocations.patch
View File

@@ -193,7 +193,7 @@ index ff13d67151c50ea11a45117e524c7524e2b1a202..8c3ee4c9aa22bcc46f2dc3a5bc35bdde
@Override
diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
index 46d9c77581b78c427692aa8645d17b3d0c2bb6a6..2452bd38f9efecc6c163b935f81a3b9dcd38f169 100644
index b19298aeaa0dacfe1afb1e672bd30b0c069ec968..8b6304160a6a3ca4c30f1ab75802a9d318d7d7c6 100644
--- a/src/main/java/net/minecraft/network/Connection.java
+++ b/src/main/java/net/minecraft/network/Connection.java
@@ -66,6 +66,7 @@ import org.apache.commons.lang3.Validate;
@@ -218,7 +218,7 @@ index 0846e11c82295ccf93683f877962ec7804dad677..b747b3858befe48996ea707cf126f6f8
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 618ff4d64d5bbebe5b73a575ec52ee17a4392c42..ede3a1466b411b331a837f423ef48a925bf7e44e 100644
index f494ea2671f219ce02c53ad725cc41646558a4c4..fc7ce6a031c50d270a979ec57e05cec0de7426c2 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -181,6 +181,7 @@ import org.bukkit.event.server.MapInitializeEvent;
@@ -230,7 +230,7 @@ index 618ff4d64d5bbebe5b73a575ec52ee17a4392c42..ede3a1466b411b331a837f423ef48a92
public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel, ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevelReader { // Paper - rewrite chunk system
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 96594a76f4c6756214feec62f8e3ecb656493ae6..2e08a927f9c3c4a4cfcad16b7a835b80efefdfca 100644
index bc3b8de51def54996cfe8e7a612f382df0b060e1..17b5d93e4d822d0b815594c18884f5349abbef19 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.EquipmentSlot;
@@ -245,8 +245,8 @@ index 96594a76f4c6756214feec62f8e3ecb656493ae6..2e08a927f9c3c4a4cfcad16b7a835b80
// Paper start
final int index;
if (packet.getCommand().length() > 64 && ((index = packet.getCommand().indexOf(' ')) == -1 || index >= 64)) {
- this.disconnect(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM);
+ this.disconnect(Component.translatable("disconnect.spam", ArrayConstants.emptyObjectArray), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Leaves - reduce array allocations
- this.disconnectAsync(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - add proper async disconnect
+ this.disconnectAsync(Component.translatable("disconnect.spam", ArrayConstants.emptyObjectArray), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - add proper async disconnect // Leaves - reduce array allocations
return;
}
// Paper end
@@ -287,7 +287,7 @@ index 40638b439966619e9c70a18a32abd95b2178fe9f..153e918f1059bb09ad074eb06bbdbbdc
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 0ba56ea6ca96cd7adb47dad756c8ed2972a2d587..875f88b62d62cc94b1ec09f9cedefc2722ddb5cc 100644
index e62a27431bb2872bdf7dcc34366249dbfe8add17..3322ee4e6720c8b06e6d6684cbac95c2d14babb1 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -950,13 +950,9 @@ public abstract class PlayerList {
@@ -357,7 +357,7 @@ index 2fa2a4eef21e786f738f36616c3160defa95bce8..36c98f611f043ebadffd1b110ba3002b
private EquipmentSlot(final EquipmentSlot.Type type, final int entityId, final int maxCount, final int armorStandId, final String name) {
this.type = type;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index ec5ac957bd463496a1d82e22db10be7d1b2de2dd..6d6bca222e5c9d676fc5416fb7f14036f0d87deb 100644
index 567ceb290d91ce6291202e03496d455503ba59c5..28b6689421b311c5aa975c1f9e3deca9ce76d688 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3280,7 +3280,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -422,7 +422,7 @@ index 1bf54b0142fe41b29b21c8b97d3f52bb24a36a92..f19ace4f9027260ded3ee37c1bda91c5
public class ShapedRecipe extends io.papermc.paper.inventory.recipe.RecipeBookExactChoiceRecipe<CraftingInput> implements CraftingRecipe { // Paper - improve exact recipe choices
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 1f6e6bba0f6d16091f4c6a5fdb4bac4579ba525f..1848ed1dff8327db5c9a01e8e2019997e927692c 100644
index 9a6a2acec1bf11282d1451f5d5178e41fab91b39..5452a15b8a082337c9e53a004e93d8058f6a0474 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -102,6 +102,7 @@ import org.bukkit.craftbukkit.util.CraftSpawnCategory;