Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-31 12:56:29 +00:00
Code Issues Releases Activity

Fix incorrect coords passing

Browse Source
This commit is contained in:
Dreeam
2025-09-30 12:47:05 -04:00
parent 34c589f5f3
commit db053d5aa9
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
leaf-server/src/main/java/org/dreeam/leaf/world/DespawnMap.java
View File

@@ -34,18 +34,18 @@ public final class DespawnMap implements Consumer<Entity> {
}
boolean fallback = false;
for (Map.Entry<MobCategory, WorldConfiguration.Entities.Spawning.DespawnRangePair> e : worldConfiguration.entities.spawning.despawnRanges.entrySet()) {
OptionalInt a = e.getValue().soft().verticalLimit.value();
OptionalInt b = e.getValue().soft().horizontalLimit.value();
OptionalInt c = e.getValue().hard().verticalLimit.value();
OptionalInt d = e.getValue().hard().horizontalLimit.value();
if (a.isPresent() && b.isPresent() && a.getAsInt() == b.getAsInt()) {
sort[e.getKey().ordinal()] = a.getAsInt();
} else if (a.isPresent() || b.isPresent()) {
OptionalInt softVertical = e.getValue().soft().verticalLimit.value();
OptionalInt softHorizontal = e.getValue().soft().horizontalLimit.value();
OptionalInt hardVertical = e.getValue().hard().verticalLimit.value();
OptionalInt hardHorizontal = e.getValue().hard().horizontalLimit.value();
if (softVertical.isPresent() && softHorizontal.isPresent() && softVertical.getAsInt() == softHorizontal.getAsInt()) {
sort[e.getKey().ordinal()] = softVertical.getAsInt();
} else if (softVertical.isPresent() || softHorizontal.isPresent()) {
fallback = true;
}
if (c.isPresent() && d.isPresent() && c.getAsInt() == d.getAsInt()) {
hard[e.getKey().ordinal()] = c.getAsInt();
} else if (c.isPresent() || d.isPresent()) {
if (hardVertical.isPresent() && hardHorizontal.isPresent() && hardVertical.getAsInt() == hardHorizontal.getAsInt()) {
hard[e.getKey().ordinal()] = hardVertical.getAsInt();
} else if (hardVertical.isPresent() || hardHorizontal.isPresent()) {
fallback = true;
}
}
@@ -78,7 +78,7 @@ public final class DespawnMap implements Consumer<Entity> {
for (int j = 0; j < i; j++) {
indices[j] = j;
}
tree.build(new double[][]{pxl, pzl, pyl}, indices);
tree.build(new double[][]{pxl, pyl, pzl}, indices);
this.difficultyIsPeaceful = world.getDifficulty() == Difficulty.PEACEFUL;
if (fallback) {
entityTickList.forEach(entity -> entity.leaf$checkDespawnFallback(this));