9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-04 15:41:40 +00:00

Updated Upstream (Leaf)

merge changes in ver/1.20.4 & opt/tracking
This commit is contained in:
Dreeam
2024-06-14 21:22:55 +08:00
parent 2e32ca3a7a
commit 69bfa16155
43 changed files with 480 additions and 52 deletions

View File

@@ -193,7 +193,7 @@ index 4f91107f9ae42f96c060c310596db9aa869a8dbc..faad96f04af2e368f0276ade417dd1ba
public boolean visible = true;
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index cb2683c7e090a8d040b581bc95a0505998f17f43..539934a75df64e7accf4829d8d4b075833bb5bc9 100644
index cb2683c7e090a8d040b581bc95a0505998f17f43..55d339ef8782e6b7ab08aebd2b96a4147ac6bcc6 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -295,7 +295,11 @@ public class ServerEntity {
@@ -235,7 +235,7 @@ index cb2683c7e090a8d040b581bc95a0505998f17f43..539934a75df64e7accf4829d8d4b0758
if (!set.isEmpty()) {
+ // Leaf start - petal - sync
+ final var copy = Lists.newArrayList(set);
+ final Set<AttributeInstance> copy = new it.unimi.dsi.fastutil.objects.ObjectOpenHashSet<>(set);
+ ((ServerLevel) this.entity.level()).chunkSource.chunkMap.runOnTrackerMainThread(() -> {
// CraftBukkit start - Send scaled max health
if (this.entity instanceof ServerPlayer) {