From 19db609bcce1b436463badd5b786a38d00abca77 Mon Sep 17 00:00:00 2001
From: Madeline Miller <mnmiller1@me.com>
Date: Sat, 15 Jul 2023 17:27:03 +1000
Subject: [PATCH] Minor optimisations to cone command algorithm

---
 .../java/com/sk89q/worldedit/EditSession.java | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
index e31f3d3fa..20386120e 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
@@ -136,7 +136,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -1795,35 +1794,36 @@ public int makeCone(BlockVector3 pos, Pattern block, double radiusX, double radi
 
         final int ceilRadiusX = (int) Math.ceil(radiusX);
         final int ceilRadiusZ = (int) Math.ceil(radiusZ);
+        final double radiusXPow = Math.pow(radiusX, 2);
+        final double radiusZPow = Math.pow(radiusZ, 2);
+        final double heightPow = Math.pow(height, 2);
 
         for (int y = 0; y < height; ++y) {
+            double ySquaredMinusHeightOverHeightSquared = Math.pow(y - height, 2) / heightPow;
+
             forX:
             for (int x = 0; x <= ceilRadiusX; ++x) {
+                double xSquaredOverRadiusX = Math.pow(x, 2) / radiusXPow;
 
-                forZ:
                 for (int z = 0; z <= ceilRadiusZ; ++z) {
-
-                    double xSquaredOverRadiusX = Math.pow(x, 2) /  Math.pow(radiusX, 2);
-                    double zSquaredOverRadiusZ = Math.pow(z, 2) / Math.pow(radiusZ, 2);
-                    double ySquaredMinusHeightOverHeightSquared = Math.pow(y - height, 2)
-                            / Math.pow(height, 2);
+                    double zSquaredOverRadiusZ = Math.pow(z, 2) / radiusZPow;
                     double distanceFromOriginMinusHeightSquared = xSquaredOverRadiusX + zSquaredOverRadiusZ
-                            - ySquaredMinusHeightOverHeightSquared;
+                        - ySquaredMinusHeightOverHeightSquared;
 
                     if (distanceFromOriginMinusHeightSquared > 1) {
                         if (z == 0) {
                             break forX;
                         }
-                        break forZ;
+                        break;
                     }
 
                     if (!filled) {
-                        double xNext = Math.pow(x + thickness, 2) /  Math.pow(radiusX, 2)
-                                + zSquaredOverRadiusZ - ySquaredMinusHeightOverHeightSquared;
+                        double xNext = Math.pow(x + thickness, 2) / radiusXPow
+                            + zSquaredOverRadiusZ - ySquaredMinusHeightOverHeightSquared;
                         double yNext = xSquaredOverRadiusX + zSquaredOverRadiusZ
-                                - Math.pow(y + thickness - height, 2) / Math.pow(height, 2);
+                            - Math.pow(y + thickness - height, 2) / heightPow;
                         double zNext = xSquaredOverRadiusX + Math.pow(z + thickness, 2)
-                                / Math.pow(radiusZ, 2) - ySquaredMinusHeightOverHeightSquared;
+                            / radiusZPow - ySquaredMinusHeightOverHeightSquared;
                         if (xNext <= 0 && zNext <= 0 && (yNext <= 0 && y + thickness != height)) {
                             continue;
                         }