From 3a23c54a91b0156bc96661266dda2391068874bc Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Mon, 16 Aug 2021 07:07:13 +0200 Subject: [PATCH] Fix server crash with BlockPopulator when entities are at a negative chunk border By: DerFrZocker --- .../org/bukkit/craftbukkit/generator/CraftLimitedRegion.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java b/paper-server/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java index 20c433f71..db77c3496 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java @@ -94,7 +94,7 @@ public class CraftLimitedRegion extends CraftRegionAccessor implements LimitedRe for (net.minecraft.world.entity.Entity entity : entities) { if (entity.isAlive()) { // check if entity is still in region or if it got teleported outside it - Preconditions.checkState(isInRegion((int) entity.locX(), (int) entity.locY(), (int) entity.locZ()), "Entity %s is not in the region", entity); + Preconditions.checkState(region.contains(entity.locX(), entity.locY(), entity.locZ()), "Entity %s is not in the region", entity); access.addEntity(entity); } } @@ -111,7 +111,7 @@ public class CraftLimitedRegion extends CraftRegionAccessor implements LimitedRe @Override public boolean isInRegion(Location location) { - return isInRegion(location.getBlockX(), location.getBlockY(), location.getBlockZ()); + return region.contains(location.getX(), location.getY(), location.getZ()); } @Override