Remove while true loop

Author: KaevonD

core/src/main/java/tc/oc/pgm/projectile/ProjectileMatchModule.java

@@ -161,47 +161,13 @@ public boolean getAsBoolean() {
 
                   projectile.teleport(newLocation);
                   if (projectileDefinition.damage != null || projectileDefinition.solidBlockCollision) {
-                    boolean finished = false;
-                    while (true) {
-                      if (currentLocation.distanceSquared(incrementingLocation) > currentLocation.distanceSquared(newLocation)) {
-                        incrementingLocation = newLocation.clone();
-                        finished = true;
+                    while (currentLocation.distanceSquared(incrementingLocation) < currentLocation.distanceSquared(newLocation)) {
+                      if (blockDisplayCollision(projectileDefinition, player, incrementingLocation)) {
+                        return true;
                       }
-                      if (projectileDefinition.damage != null) {
-                        Collection<Entity> nearbyEntities = incrementingLocation.getNearbyEntities(0.5 * projectileDefinition.scale, 0.5 * projectileDefinition.scale, 0.5 * projectileDefinition.scale);
-                        if (!nearbyEntities.isEmpty()) {
-                          Party playerParty = PGM.get().getMatchManager().getPlayer(player).getParty();
-                          for (Entity entity : nearbyEntities) {
-                            if (entity instanceof Player) {
-                              if (playerParty != PGM.get().getMatchManager().getPlayer(((Player) entity)).getParty()) {
-                                ((Player) entity).damage(projectileDefinition.damage, player);
-                                return true;
-                              }
-                            }
-                          }
-                        }
-                      }
-                      if (projectileDefinition.solidBlockCollision) {
-                        double posScale = 0.5 * projectileDefinition.scale;
-                        double negScale = -0.5 * projectileDefinition.scale;
-
-                        Block b1 = incrementingLocation.clone().add(negScale, negScale, negScale).getBlock();
-                        Block b2 = incrementingLocation.clone().add(posScale, negScale, negScale).getBlock();
-                        Block b3 = incrementingLocation.clone().add(negScale, posScale, negScale).getBlock();
-                        Block b4 = incrementingLocation.clone().add(posScale, posScale, negScale).getBlock();
-                        Block b5 = incrementingLocation.clone().add(negScale, negScale, posScale).getBlock();
-                        Block b6 = incrementingLocation.clone().add(posScale, negScale, posScale).getBlock();
-                        Block b7 = incrementingLocation.clone().add(negScale, posScale, posScale).getBlock();
-                        Block b8 = incrementingLocation.clone().add(posScale, posScale, posScale).getBlock();
-
-                        if (b1.getType().isSolid() || b2.getType().isSolid() || b3.getType().isSolid() || b4.getType().isSolid() || b5.getType().isSolid() || b6.getType().isSolid() || b7.getType().isSolid() || b8.getType().isSolid()) {
-                          return true;
-                        }
-                      }
-
-                      if (finished) break;
                       incrementingLocation.add(normalizedDirection.clone().multiply(projectileDefinition.scale));
                     }
+                    return blockDisplayCollision(projectileDefinition, player, incrementingLocation);
                   }
                   return false;
                 }
@@ -237,6 +203,39 @@ public boolean getAsBoolean() {
     }
   }
 
+  private boolean blockDisplayCollision(ProjectileDefinition projectileDefinition, Player player, Location location) {
+    if (projectileDefinition.damage != null) {
+      Collection<Entity> nearbyEntities = location.getNearbyEntities(0.5 * projectileDefinition.scale, 0.5 * projectileDefinition.scale, 0.5 * projectileDefinition.scale);
+      if (!nearbyEntities.isEmpty()) {
+        Party playerParty = PGM.get().getMatchManager().getPlayer(player).getParty();
+        for (Entity entity : nearbyEntities) {
+          if (entity instanceof Player) {
+            if (playerParty != PGM.get().getMatchManager().getPlayer(((Player) entity)).getParty()) {
+              ((Player) entity).damage(projectileDefinition.damage, player);
+              return true;
+            }
+          }
+        }
+      }
+    }
+    if (projectileDefinition.solidBlockCollision) {
+      double posScale = 0.5 * projectileDefinition.scale;
+      double negScale = -0.5 * projectileDefinition.scale;
+
+      Block b1 = location.clone().add(negScale, negScale, negScale).getBlock();
+      Block b2 = location.clone().add(posScale, negScale, negScale).getBlock();
+      Block b3 = location.clone().add(negScale, posScale, negScale).getBlock();
+      Block b4 = location.clone().add(posScale, posScale, negScale).getBlock();
+      Block b5 = location.clone().add(negScale, negScale, posScale).getBlock();
+      Block b6 = location.clone().add(posScale, negScale, posScale).getBlock();
+      Block b7 = location.clone().add(negScale, posScale, posScale).getBlock();
+      Block b8 = location.clone().add(posScale, posScale, posScale).getBlock();
+
+      return b1.getType().isSolid() || b2.getType().isSolid() || b3.getType().isSolid() || b4.getType().isSolid() || b5.getType().isSolid() || b6.getType().isSolid() || b7.getType().isSolid() || b8.getType().isSolid();
+    }
+    return false;
+  }
+
   // For entities which need their velocity simulated
   private Location calculateTo(
           final Location entityLocation,