diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java index bb880fcf0..648e6baf8 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java @@ -437,19 +437,19 @@ public class Cannon extends SiegeWeapon int attempts = 0; while (blocks.size() < 10 && (attempts < 30)) { + attempts++; Block block = UtilAlg.getRandomLocation(event.getProjectile().getLocation(), (4 * getPowerLevel())).getBlock(); - - if (_siegeManager.getClansManager().getClanUtility().getClaim(block.getLocation()) != null && !_siegeManager.getClansManager().getBlacklist().allowed(_siegeManager.getClansManager().getClanUtility().getClaim(block.getLocation()).Owner)) + + ClanTerritory claim = _siegeManager.getClansManager().getClanUtility().getClaim(block.getLocation()); + if (claim != null && !_siegeManager.getClansManager().getBlacklist().allowed(claim.Owner)) { - continue; + continue; // This block is in a claimed territory } - + if ((block.getType() != Material.AIR) && (!blocks.contains(block))) { blocks.add(block); } - - attempts++; } _clans.getExplosion().BlockExplosion(