Sync changes

Winds-Studio · Feb 9, 2025 · 6c6bcf7 · 6c6bcf7
1 parent d1f8d6f
commit 6c6bcf7
Show file tree

Hide file tree

Showing 33 changed files with 12 additions and 54 deletions.
diff --git a/leaf-server/minecraft-patches/features/0020-Leaves-Protocol-Core.patch b/leaf-server/minecraft-patches/features/0020-Leaves-Protocol-Core.patch
@@ -9,7 +9,7 @@ and change store way to sql maybe?
 Original license: GPLv3
 Original project: https://github.com/LeavesMC/Leaves
 
-Commit: 99b3aafce1f162c68a771fe56d77f33648636b7d
+Commit: f07c26c892bc919de82ee0c90ccd5bdca41f20ed
 
 diff --git a/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java b/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
 index fb263fa1f30a7dfcb7ec2656abfb38e5fe88eac9..7e19dfe90a63ff26f03b95891dacb7360bba5a3c 100644

diff --git a/leaf-server/minecraft-patches/features/0024-Leaves-Replay-Mod-API.patch b/leaf-server/minecraft-patches/features/0024-Leaves-Replay-Mod-API.patch
@@ -191,7 +191,7 @@ index 622257dbbe572de33e15abef9055016268730261..dfb4524d80f642eff1b146dd2fbfa07f
      private final ServerStatsCounter stats;
      private float lastRecordedHealthAndAbsorption = Float.MIN_VALUE;
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index e3d09d5f4efb32bb276e001e5ee747a775b502ee..78b15d750d75e5d4c2318a3a18e83afdd5f4fbe1 100644
+index e3d09d5f4efb32bb276e001e5ee747a775b502ee..86ce80765eb7645533806f730b15557f8ea6a9a2 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -132,6 +132,7 @@ public abstract class PlayerList {
@@ -206,7 +206,7 @@ index e3d09d5f4efb32bb276e001e5ee747a775b502ee..78b15d750d75e5d4c2318a3a18e83afd
 
      abstract public void loadAndSaveFiles(); // Paper - fix converting txt to json file; moved from DedicatedPlayerList constructor
 
-+    // Leaves start - replay mod api
++    // Leaves start - replay api
 +    public void placeNewPhotographer(Connection connection, org.leavesmc.leaves.replay.ServerPhotographer player, ServerLevel worldserver) {
 +        player.isRealPlayer = true; // Paper
 +        player.loginTime = System.currentTimeMillis(); // Paper
@@ -304,7 +304,7 @@ index e3d09d5f4efb32bb276e001e5ee747a775b502ee..78b15d750d75e5d4c2318a3a18e83afd
 +            );
 +        }
 +    }
-+    // Leaves end - replay mod api
++    // Leaves end - replay api
 +
      public void placeNewPlayer(Connection connection, ServerPlayer player, CommonListenerCookie cookie) {
          player.isRealPlayer = true; // Paper

diff --git a/leaf-server/minecraft-patches/features/0078-Hide-specified-item-components.patch b/leaf-server/minecraft-patches/features/0078-Hide-specified-item-components.patch
diff --git a/...during-inactive-ticks-for-non-aware.patch → ...during-inactive-ticks-for-non-aware.patch b/...during-inactive-ticks-for-non-aware.patch → ...during-inactive-ticks-for-non-aware.patch
diff --git a/...zombie-reinforcements-loading-chunk.patch → ...zombie-reinforcements-loading-chunk.patch b/...zombie-reinforcements-loading-chunk.patch → ...zombie-reinforcements-loading-chunk.patch
diff --git a/...aperPR-Fix-some-beacon-event-issues.patch → ...aperPR-Fix-some-beacon-event-issues.patch b/...aperPR-Fix-some-beacon-event-issues.patch → ...aperPR-Fix-some-beacon-event-issues.patch
diff --git a/...82-Dont-send-useless-entity-packets.patch → ...81-Dont-send-useless-entity-packets.patch b/...82-Dont-send-useless-entity-packets.patch → ...81-Dont-send-useless-entity-packets.patch
diff --git a/...n-t-spawn-if-lastSpawnState-is-null.patch → ...n-t-spawn-if-lastSpawnState-is-null.patch b/...n-t-spawn-if-lastSpawnState-is-null.patch → ...n-t-spawn-if-lastSpawnState-is-null.patch
diff --git a/...features/0084-Multithreaded-Tracker.patch → ...features/0083-Multithreaded-Tracker.patch b/...features/0084-Multithreaded-Tracker.patch → ...features/0083-Multithreaded-Tracker.patch
diff --git a/...s/0085-Nitori-Async-playerdata-Save.patch → ...s/0084-Nitori-Async-playerdata-Save.patch b/...s/0085-Nitori-Async-playerdata-Save.patch → ...s/0084-Nitori-Async-playerdata-Save.patch
diff --git a/...e-nearby-alive-players-for-spawning.patch → ...e-nearby-alive-players-for-spawning.patch b/...e-nearby-alive-players-for-spawning.patch → ...e-nearby-alive-players-for-spawning.patch
diff --git a/...s/0087-Cache-blockstate-cache-array.patch → ...s/0086-Cache-blockstate-cache-array.patch b/...s/0087-Cache-blockstate-cache-array.patch → ...s/0086-Cache-blockstate-cache-array.patch
diff --git a/.../features/0088-Asynchronous-locator.patch → .../features/0087-Asynchronous-locator.patch b/.../features/0088-Asynchronous-locator.patch → .../features/0087-Asynchronous-locator.patch
diff --git a/...tities-in-NearestLivingEntitySensor.patch → ...tities-in-NearestLivingEntitySensor.patch b/...tities-in-NearestLivingEntitySensor.patch → ...tities-in-NearestLivingEntitySensor.patch
@@ -14,7 +14,7 @@ In non-strict testing, this can give ~20-40% improvement (54MSPT -> 44MSPT),
 under 625 villagers situation.
 
 diff --git a/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java b/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java
-index b0c5e41fefc7c9adf1a61bd5b52861736657d37e..7f67848eff9f74881e7a9cd56a2e69ec6fd81e44 100644
+index b0c5e41fefc7c9adf1a61bd5b52861736657d37e..66374b79ade5cd10fa6e1d9187bf6b1112da4827 100644
 --- a/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java
 +++ b/net/minecraft/world/entity/ai/sensing/NearestLivingEntitySensor.java
 @@ -13,6 +13,21 @@ import net.minecraft.world.entity.ai.memory.NearestVisibleLivingEntities;
@@ -39,7 +39,7 @@ index b0c5e41fefc7c9adf1a61bd5b52861736657d37e..7f67848eff9f74881e7a9cd56a2e69ec
      @Override
      protected void doTick(ServerLevel level, T entity) {
          double attributeValue = entity.getAttributeValue(Attributes.FOLLOW_RANGE);
-@@ -20,11 +35,145 @@ public class NearestLivingEntitySensor<T extends LivingEntity> extends Sensor<T>
+@@ -20,11 +35,150 @@ public class NearestLivingEntitySensor<T extends LivingEntity> extends Sensor<T>
          List<LivingEntity> entitiesOfClass = level.getEntitiesOfClass(
              LivingEntity.class, aabb, matchableEntity -> matchableEntity != entity && matchableEntity.isAlive()
          );
@@ -139,7 +139,12 @@ index b0c5e41fefc7c9adf1a61bd5b52861736657d37e..7f67848eff9f74881e7a9cd56a2e69ec
 +        }
 +        double invMaxDist = 1.0 / maxDist;
 +
-+        for (EntityDistance e : arr) {
++        for (int i = 0; i < NUM_BUCKETS; i++) {
++            buckets[i] = new it.unimi.dsi.fastutil.objects.ObjectArrayList<>();
++        }
++
++        for (int idx = 0; idx < arr.length; idx++) {
++            EntityDistance e = arr[idx];
 +            int bucketIndex = (int) (e.distance * invMaxDist * NUM_BUCKETS_MINUS_1);
 +            buckets[bucketIndex].add(e);
 +        }

diff --git a/...uce-memory-footprint-of-CompoundTag.patch → ...uce-memory-footprint-of-CompoundTag.patch b/...uce-memory-footprint-of-CompoundTag.patch → ...uce-memory-footprint-of-CompoundTag.patch
diff --git a/.../0091-Optimize-Entity-distanceToSqr.patch → .../0090-Optimize-Entity-distanceToSqr.patch b/.../0091-Optimize-Entity-distanceToSqr.patch → .../0090-Optimize-Entity-distanceToSqr.patch
diff --git a/...e-snapshots-for-TileEntity-getOwner.patch → ...e-snapshots-for-TileEntity-getOwner.patch b/...e-snapshots-for-TileEntity-getOwner.patch → ...e-snapshots-for-TileEntity-getOwner.patch
diff --git a/...res/0093-Cache-tile-entity-position.patch → ...res/0092-Cache-tile-entity-position.patch b/...res/0093-Cache-tile-entity-position.patch → ...res/0092-Cache-tile-entity-position.patch
diff --git a/...features/0094-TT20-Lag-compensation.patch → ...features/0093-TT20-Lag-compensation.patch b/...features/0094-TT20-Lag-compensation.patch → ...features/0093-TT20-Lag-compensation.patch
diff --git a/...atures/0095-C2ME-Reduce-Allocations.patch → ...atures/0094-C2ME-Reduce-Allocations.patch b/...atures/0095-C2ME-Reduce-Allocations.patch → ...atures/0094-C2ME-Reduce-Allocations.patch
diff --git a/...cessary-calculations-if-player-is-n.patch → ...cessary-calculations-if-player-is-n.patch b/...cessary-calculations-if-player-is-n.patch → ...cessary-calculations-if-player-is-n.patch
diff --git a/...hes/features/0097-Lithium-fast-util.patch → ...hes/features/0096-Lithium-fast-util.patch b/...hes/features/0097-Lithium-fast-util.patch → ...hes/features/0096-Lithium-fast-util.patch
diff --git a/...eatures/0098-Lithium-CompactSineLUT.patch → ...eatures/0097-Lithium-CompactSineLUT.patch b/...eatures/0098-Lithium-CompactSineLUT.patch → ...eatures/0097-Lithium-CompactSineLUT.patch
diff --git a/...099-Lithium-cached-iterate-outwards.patch → ...098-Lithium-cached-iterate-outwards.patch b/...099-Lithium-cached-iterate-outwards.patch → ...098-Lithium-cached-iterate-outwards.patch
diff --git a/...eatures/0100-Smooth-teleport-config.patch → ...eatures/0099-Smooth-teleport-config.patch b/...eatures/0100-Smooth-teleport-config.patch → ...eatures/0099-Smooth-teleport-config.patch
diff --git a/...read-safe-ban-list-date-format-pars.patch → ...read-safe-ban-list-date-format-pars.patch b/...read-safe-ban-list-date-format-pars.patch → ...read-safe-ban-list-date-format-pars.patch
diff --git a/...tartEachNonRunningBehavior-in-Brain.patch → ...tartEachNonRunningBehavior-in-Brain.patch b/...tartEachNonRunningBehavior-in-Brain.patch → ...tartEachNonRunningBehavior-in-Brain.patch
diff --git a/...res/0103-Lithium-equipment-tracking.patch → ...res/0102-Lithium-equipment-tracking.patch b/...res/0103-Lithium-equipment-tracking.patch → ...res/0102-Lithium-equipment-tracking.patch
diff --git a/...s/0104-C2ME-Optimize-world-gen-math.patch → ...s/0103-C2ME-Optimize-world-gen-math.patch b/...s/0104-C2ME-Optimize-world-gen-math.patch → ...s/0103-C2ME-Optimize-world-gen-math.patch
diff --git a/...tches/features/0105-Cache-chunk-key.patch → ...tches/features/0104-Cache-chunk-key.patch b/...tches/features/0105-Cache-chunk-key.patch → ...tches/features/0104-Cache-chunk-key.patch
diff --git a/...0106-Cache-random-tick-block-status.patch → ...0105-Cache-random-tick-block-status.patch b/...0106-Cache-random-tick-block-status.patch → ...0105-Cache-random-tick-block-status.patch
diff --git a/...7-Cache-part-of-canHoldFluid-result.patch → ...6-Cache-part-of-canHoldFluid-result.patch b/...7-Cache-part-of-canHoldFluid-result.patch → ...6-Cache-part-of-canHoldFluid-result.patch
diff --git a/...res/0108-Configurable-tripwire-dupe.patch → ...res/0107-Configurable-tripwire-dupe.patch b/...res/0108-Configurable-tripwire-dupe.patch → ...res/0107-Configurable-tripwire-dupe.patch