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

Update Paper

Browse Source
This commit is contained in:
violetc
2023-09-24 17:30:45 +08:00
parent 363950602a
commit 847357b67c
31 changed files with 144 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0094-Reduce-array-allocations.patch
View File

@@ -202,7 +202,7 @@ index 25ad2c6ff968f4a6b16b4dea3f67341a4261f2a4..478bc2428e133414d13e9a44ad7c2c56
@Override
diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
index cf20f0983fc25b26cf92b9d3a28746b1909fc56b..c8d62a76bfa1a54b6ecb23f0d53ba2db15fcb1f7 100644
index 52cb6476604c98465f81ff9e8d8344d7536a8868..ed41259f7fdf1f23b2cf00a29957d45ae8b61cc1 100644
--- a/src/main/java/net/minecraft/network/Connection.java
+++ b/src/main/java/net/minecraft/network/Connection.java
@@ -47,6 +47,7 @@ import org.apache.commons.lang3.Validate;
@@ -266,7 +266,7 @@ index 55ef6d5ffebe04e678dc89ec2740f031af361cb8..4c86d1836c8b4ac9c535cf5bccd71dec
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 f5e16e9f144824a78ccd4a9fa0a5c0f3364fdf5d..43dc38afc03323ebf4192f58a7703402f9379ade 100644
index 1faea96ca133e4280f90aff86efbfbace370b273..172d8c9d8c46e242f467fd8a6c89b40e3419a8e5 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 f5e16e9f144824a78ccd4a9fa0a5c0f3364fdf5d..43dc38afc03323ebf4192f58a7703402
return;
}
// Paper end
@@ -3380,7 +3381,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3359,7 +3360,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) {
@@ -429,10 +429,10 @@ index d56f683a5d043f3be624a94d889acc1df0e95554..7e3265028cce8cafd7da9d1aaa41856f
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index e65ce75e2d44843afa6c4a033885a55dcb43c635..a54d43e5172afdb7850b2a52436c9a3d93cccef7 100644
index 9938f9f5cecb11401d0fa73d34c638fd39dc0759..bd2d37d9a64765083ca296e9b113e2ff3172be59 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1073,7 +1073,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1080,7 +1080,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@Override
protected void dropCustomDeathLoot(DamageSource source, int lootingMultiplier, boolean allowDrops) {
super.dropCustomDeathLoot(source, lootingMultiplier, allowDrops);
@@ -441,7 +441,7 @@ index e65ce75e2d44843afa6c4a033885a55dcb43c635..a54d43e5172afdb7850b2a52436c9a3d
int j = aenumitemslot.length;
for (int k = 0; k < j; ++k) {
@@ -1135,7 +1135,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1142,7 +1142,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
}
boolean flag = true;
@@ -450,7 +450,7 @@ index e65ce75e2d44843afa6c4a033885a55dcb43c635..a54d43e5172afdb7850b2a52436c9a3d
int j = aenumitemslot.length;
for (int k = 0; k < j; ++k) {
@@ -1222,7 +1222,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1229,7 +1229,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
float f = localDifficulty.getSpecialMultiplier();
this.enchantSpawnedWeapon(random, f);
@@ -459,7 +459,7 @@ index e65ce75e2d44843afa6c4a033885a55dcb43c635..a54d43e5172afdb7850b2a52436c9a3d
int i = aenumitemslot.length;
for (int j = 0; j < i; ++j) {
@@ -1441,7 +1441,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1448,7 +1448,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
t0.setInvulnerable(this.isInvulnerable());
if (flag) {
t0.setCanPickUpLoot(this.canPickUpLoot());
@@ -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 fac8de87a096e2f3ba71fc4043acf66491c5b62b..eaa5d29c3e4c32db21cc72295551d81b65e274b7 100644
index 846ee484d48db1f80b95b526b5321826a00a6507..a7e29846aea91b31a3b0c31b7917d3fbd8b33624 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -1019,7 +1019,7 @@ public final class ItemStack {
@@ -1020,7 +1020,7 @@ public final class ItemStack {
int k;
if (ItemStack.shouldShowInTooltip(i, ItemStack.TooltipPart.MODIFIERS)) {
@@ -533,7 +533,7 @@ index 2bfbdaeb2b0d99dfd956cd5936403fe8b0eeae64..7ad1545631604aa55f6d4fbdcbaefe6d
public Enchantments() {}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index fdb171a28f73f6a0fae5aba669014edd4fee83b8..47ccf2ef6fb6fd05d6be5457a7ecde0faa99aeb7 100644
index 79d3a24d9bb9bf5da84283bcbb70fec101082199..e126c62ecb9ca29c97a6b3ff4264adb177d352ea 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -104,6 +104,7 @@ import org.bukkit.entity.SpawnCategory;