diff --git a/paper-server/src/main/java/io/papermc/paper/configuration/type/DespawnRange.java b/paper-server/src/main/java/io/papermc/paper/configuration/type/DespawnRange.java index 7779edcbbce3..5b7f49b54ba5 100644 --- a/paper-server/src/main/java/io/papermc/paper/configuration/type/DespawnRange.java +++ b/paper-server/src/main/java/io/papermc/paper/configuration/type/DespawnRange.java @@ -28,6 +28,7 @@ public final class DespawnRange { private double preComputedHorizontalLimitSquared; // ac^2 private double preComputedHorizontalLimitSquaredOverVerticalLimitSquared; // ac^2/b^2 private int preComputedVanillaDefaultLimit; + private double preComputedVanillaDefaultLimitSquared; public DespawnRange(final IntOr.Default generalLimit) { this(generalLimit, generalLimit, false); @@ -47,6 +48,7 @@ public void preComputed(int defaultDistanceLimit, String identifier) throws Seri throw new SerializationException("Horizontal limit must be greater than 0 for " + identifier); } this.preComputedVanillaDefaultLimit = defaultDistanceLimit; + this.preComputedVanillaDefaultLimitSquared = (double) defaultDistanceLimit * defaultDistanceLimit; this.preComputedHorizontalLimitSquared = Math.pow(this.horizontalLimit.or(defaultDistanceLimit), 2); if (!this.horizontalLimit.isDefined() && !this.verticalLimit.isDefined()) { this.preComputedHorizontalLimitSquaredOverVerticalLimitSquared = 1.0; @@ -56,11 +58,13 @@ public void preComputed(int defaultDistanceLimit, String identifier) throws Seri } public boolean shouldDespawn(final Shape shape, final double dxSqr, final double dySqr, final double dzSqr, final double dy) { - if (shape == Shape.ELLIPSOID) { - return dxSqr + dzSqr + (dySqr * this.preComputedHorizontalLimitSquaredOverVerticalLimitSquared) > this.preComputedHorizontalLimitSquared; - } else { - return dxSqr + dzSqr > this.preComputedHorizontalLimitSquared || dy > this.verticalLimit.or(this.preComputedVanillaDefaultLimit); - } + final double horizontalDistanceSquared = dxSqr + dzSqr; + final double horizontalLimitSquared = this.preComputedHorizontalLimitSquared; + return switch (shape) { + case ELLIPSOID -> horizontalDistanceSquared + dySqr * this.preComputedHorizontalLimitSquaredOverVerticalLimitSquared > horizontalLimitSquared; + case CYLINDER -> horizontalDistanceSquared > horizontalLimitSquared || dy > this.verticalLimit.or(this.preComputedVanillaDefaultLimit); + case HYBRID -> dxSqr > horizontalLimitSquared || dzSqr > horizontalLimitSquared || dy > this.verticalLimit.or(this.preComputedVanillaDefaultLimit) || horizontalDistanceSquared + dySqr > this.preComputedVanillaDefaultLimitSquared; + }; } public boolean wasDefinedViaLongSyntax() { @@ -68,7 +72,7 @@ public boolean wasDefinedViaLongSyntax() { } public enum Shape { - CYLINDER, ELLIPSOID + CYLINDER, ELLIPSOID, HYBRID } static final class Serializer implements TypeSerializer {