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

Update Paper

Browse Source
This commit is contained in:
violetc
2024-02-27 22:37:56 +08:00
parent 42580f330c
commit 5a586cb317
45 changed files with 215 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
patches/server/0088-Reduce-array-allocations.patch
View File

@@ -73,18 +73,18 @@ index ae60bd96b5284d54676d8e7e4dd5d170b526ec1e..ad33c51ea9f74d2afd39c9139a9114b0
return true;
}
diff --git a/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java b/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java
index 7e8dc9e8f381abfdcce2746edc93122d623622d1..59403aa7b77adab763c60f3f7805c802a94dcd41 100644
index c78cbec447032de9fe69748591bef6be300160ed..127525545aea0ed32d5385e0f35de1cb5671c429 100644
--- a/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java
+++ b/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java
@@ -24,6 +24,7 @@ import java.util.Arrays;
import java.util.Iterator;
@@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.function.Predicate;
import org.bukkit.event.entity.EntityRemoveEvent;
+import top.leavesmc.leaves.util.ArrayConstants;
public final class ChunkEntitySlices {
@@ -82,7 +83,7 @@ public final class ChunkEntitySlices {
@@ -83,7 +84,7 @@ public final class ChunkEntitySlices {
}
}
@@ -93,7 +93,7 @@ index 7e8dc9e8f381abfdcce2746edc93122d623622d1..59403aa7b77adab763c60f3f7805c802
}
public CompoundTag save() {
@@ -303,7 +304,7 @@ public final class ChunkEntitySlices {
@@ -304,7 +305,7 @@ public final class ChunkEntitySlices {
protected static final class BasicEntityList<E extends Entity> {
@@ -102,7 +102,7 @@ index 7e8dc9e8f381abfdcce2746edc93122d623622d1..59403aa7b77adab763c60f3f7805c802
protected static final int DEFAULT_CAPACITY = 4;
protected E[] storage;
@@ -314,7 +315,7 @@ public final class ChunkEntitySlices {
@@ -315,7 +316,7 @@ public final class ChunkEntitySlices {
}
public BasicEntityList(final int cap) {
@@ -111,7 +111,7 @@ index 7e8dc9e8f381abfdcce2746edc93122d623622d1..59403aa7b77adab763c60f3f7805c802
}
public boolean isEmpty() {
@@ -326,7 +327,7 @@ public final class ChunkEntitySlices {
@@ -327,7 +328,7 @@ public final class ChunkEntitySlices {
}
private void resize() {
@@ -227,7 +227,7 @@ index b2183c298b0c68daee41238735621ff002338a68..3957ab1ebd7e84cfe0bef81a8cce566d
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 678410cd734cd7e3e3b999b7908f2e3f25f23a13..1240121d732a9697ec6bffcc459a00c71d5f4350 100644
index 19cad699f2bced15ef92be23a4c3485ece72734f..2ab4340e5603607e54773d4daaa115c09487da54 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -177,6 +177,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
@@ -257,7 +257,7 @@ index 678410cd734cd7e3e3b999b7908f2e3f25f23a13..1240121d732a9697ec6bffcc459a00c7
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 08d66f20294b7f4ef0f3f6c5ef799348ea3d9ce5..0e6cec7fd2ed5b8a647678a0d5ab783e3fe10d43 100644
index 703d2bf9f486a4effba2c265c117b8a24a8bb65f..6745b01c324589ae14b4162729e087efb29116d8 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -242,6 +242,7 @@ import org.bukkit.inventory.EquipmentSlot;
@@ -310,10 +310,10 @@ index c5fa9f4d28f9a7f64a50a902ee5e631bfc00119c..4f93d69b51f91e25f1ee00300b553311
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 823fd92c38263278673a8c9639952466c51ca16c..3bec06ed4b47af1b40ba4fef264ef7b3d643fbf1 100644
index 6e5a7edfbc8781def735d0b2250888288560fbc4..139129f0110dc656bc729ce795f012ec087641cf 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -122,6 +122,7 @@ import org.bukkit.event.player.PlayerSpawnChangeEvent;
@@ -123,6 +123,7 @@ import org.bukkit.event.player.PlayerSpawnChangeEvent;
import top.leavesmc.leaves.bot.ServerBot;
import top.leavesmc.leaves.util.ReturnPortalManager; // Leaves - return portal fix
@@ -322,10 +322,10 @@ index 823fd92c38263278673a8c9639952466c51ca16c..3bec06ed4b47af1b40ba4fef264ef7b3
public abstract class PlayerList {
diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
index 35f973cc2c0989256fa21abaf0327c2f36dbe4c9..a9ece1225fa302843423006f610889cd9773fbfb 100644
index 7e133752ccb1ea7c0b4fa781feb1a88e2cfdcf6d..b2a8a6f3a6a2934f30d9212bd935651056551be8 100644
--- a/src/main/java/net/minecraft/server/players/StoredUserList.java
+++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
@@ -25,6 +25,7 @@ import javax.annotation.Nullable;
@@ -24,6 +24,7 @@ import javax.annotation.Nullable;
import net.minecraft.Util;
import net.minecraft.util.GsonHelper;
import org.slf4j.Logger;
@@ -333,7 +333,7 @@ index 35f973cc2c0989256fa21abaf0327c2f36dbe4c9..a9ece1225fa302843423006f610889cd
public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
@@ -77,7 +78,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
@@ -76,7 +77,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
}
public String[] getUserList() {
@@ -371,10 +371,10 @@ index 2e324276ea4cd9e528c6a3f9a9ba394b378fe075..8d949983a30f27a60982f6b406151408
private EquipmentSlot(EquipmentSlot.Type type, int entityId, int armorStandId, 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 b39c0db368b5de59503e434aa3e10f6233375fae..0a5d43fa861aed808593e22aaa045bc35543deb9 100644
index d934a51781615d92561ab558022040ee5eb91592..4a743b38d32dc31e3867900e13fffd12505a8710 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3158,7 +3158,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3166,7 +3166,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@Nullable
private Map<EquipmentSlot, ItemStack> collectEquipmentChanges() {
Map<EquipmentSlot, ItemStack> map = null;
@@ -384,10 +384,10 @@ index b39c0db368b5de59503e434aa3e10f6233375fae..0a5d43fa861aed808593e22aaa045bc3
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 35e2cf1b4f5e7f15ff7821b09ed42a1cc69bb3ac..ab781eeb24f832a13b1cedf73ca6391daaf58248 100644
index 9fa6b43768ad5608db9232d464a455eca453b7fd..42aa72f4a665f550013d1172121950cfc3bb88a3 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1088,7 +1088,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1089,7 +1089,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@Override
protected void dropCustomDeathLoot(DamageSource source, int lootingMultiplier, boolean allowDrops) {
super.dropCustomDeathLoot(source, lootingMultiplier, allowDrops);
@@ -396,7 +396,7 @@ index 35e2cf1b4f5e7f15ff7821b09ed42a1cc69bb3ac..ab781eeb24f832a13b1cedf73ca6391d
int j = aenumitemslot.length;
for (int k = 0; k < j; ++k) {
@@ -1151,7 +1151,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1152,7 +1152,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
}
boolean flag = true;
@@ -405,7 +405,7 @@ index 35e2cf1b4f5e7f15ff7821b09ed42a1cc69bb3ac..ab781eeb24f832a13b1cedf73ca6391d
int j = aenumitemslot.length;
for (int k = 0; k < j; ++k) {
@@ -1238,7 +1238,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1239,7 +1239,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
float f = localDifficulty.getSpecialMultiplier();
this.enchantSpawnedWeapon(random, f);
@@ -414,7 +414,7 @@ index 35e2cf1b4f5e7f15ff7821b09ed42a1cc69bb3ac..ab781eeb24f832a13b1cedf73ca6391d
int i = aenumitemslot.length;
for (int j = 0; j < i; ++j) {
@@ -1457,7 +1457,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1458,7 +1458,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
t0.setInvulnerable(this.isInvulnerable());
if (flag) {
t0.setCanPickUpLoot(this.canPickUpLoot());
@@ -479,7 +479,7 @@ index 6c2e8049c2197ddc912c1a0fc99c87beae81e25b..be13baa7b51c4ad377b50d8ca8f7cfad
private static Enchantment register(String name, Enchantment enchantment) {
return Registry.register(BuiltInRegistries.ENCHANTMENT, name, enchantment);
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index dc439ab9e7224d36cda22e2acb11fe7f346ef849..e94489ae3c93b9ff19a56163835afd0c6f342fc1 100644
index 8b51e2dc811876a5bf043cdeb54cd3913d57fef2..b850e35e2bf5bba06f982328745ece5ba4d57194 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -95,6 +95,7 @@ import org.bukkit.craftbukkit.util.CraftSpawnCategory;