Various fixes (#545)

* Fix SandSpout creation from EarthPassive sand

* Fixed WaterCombo IceWave not applying cooldown to WaterWave

src/com/projectkorra/projectkorra/earthbending/SandSpout.java

@@ -60,6 +60,10 @@ public class SandSpout extends SandAbility {
 			return;
 		}
 		
+		if (EarthPassive.isPassiveSand(topBlock)) {
+			return;
+		}
+		
 		flight = new Flight(player);
 		start();
 		bPlayer.addCooldown(this);
@@ -80,6 +84,12 @@ public class SandSpout extends SandAbility {
 		}
 		
 		Block block = getGround();
+		
+		if (EarthPassive.isPassiveSand(block)) {
+			remove();
+			return;
+		}
+		
 		if (block != null && (block.getType() == Material.SAND || block.getType() == Material.SANDSTONE || block.getType() == Material.RED_SANDSTONE)) {
 			double dy = player.getLocation().getY() - block.getY();
 			if (dy > height) {

src/com/projectkorra/projectkorra/waterbending/WaterCombo.java

@@ -75,6 +75,12 @@ public class WaterCombo extends IceAbility implements ComboAbility {
 		}
 
 		if (name.equalsIgnoreCase("IceWave")) {
+			
+			if (bPlayer.isOnCooldown("IceWave") && !bPlayer.isAvatarState()) {
+				remove();
+				return;
+			}
+			
 			this.cooldown = getConfig().getLong("Abilities.Water.WaterCombo.IceWave.Cooldown");
 		} else if (name.equalsIgnoreCase("IceBullet")) {
 			this.damage = getConfig().getDouble("Abilities.Water.WaterCombo.IceBullet.Damage");
@@ -205,13 +211,9 @@ public class WaterCombo extends IceAbility implements ComboAbility {
 			return;
 		} else if (name.equalsIgnoreCase("IceWave")) {
 			if (origin == null && WaterSpoutWave.containsType(player, WaterSpoutWave.AbilityType.RELEASE)) {
-				if (bPlayer.isOnCooldown("IceWave") && !bPlayer.isAvatarState()) {
-					remove();
-					return;
-				}
-				
 				bPlayer.addCooldown("IceWave", cooldown);
 				origin = player.getLocation();
+				
 				WaterSpoutWave wave = WaterSpoutWave.getType(player, WaterSpoutWave.AbilityType.RELEASE).get(0);
 				wave.setIceWave(true);
 			} else if (!WaterSpoutWave.containsType(player, WaterSpoutWave.AbilityType.RELEASE)) {
@@ -305,7 +307,12 @@ public class WaterCombo extends IceAbility implements ComboAbility {
 		if (waterGrabber != null) {
 			waterGrabber.remove();
 		}
+		
 		bPlayer.addCooldown(this);
+		
+		if (name == "IceWave") {
+			bPlayer.addCooldown("WaterWave", getConfig().getLong("Abilities.Water.WaterSpout.Wave.Cooldown"));
+		}
 	}
 
 	public void revertBlocks() {
@@ -564,4 +571,4 @@ public class WaterCombo extends IceAbility implements ComboAbility {
 		
 	}
 	
-}
+}

src/com/projectkorra/projectkorra/waterbending/WaterSpoutWave.java

@@ -449,7 +449,7 @@ public class WaterSpoutWave extends WaterAbility {
 
 	@Override
 	public String getName() {
-		return this.isIceWave() ? "IceWave" : "WaterSpout";
+		return "WaterSpout";
 	}
 	
 	@Override
@@ -645,4 +645,4 @@ public class WaterSpoutWave extends WaterAbility {
 		this.location = location;
 	}
 		
-}
+}