From 4be85e8491ce31a2e9407aea0b11d90afa1d2f73 Mon Sep 17 00:00:00 2001
From: Simplicitee <simplicitee123@gmail.com>
Date: Wed, 28 Dec 2016 01:20:46 -0500
Subject: [PATCH] PhaseChange snow change (#666)

* Fix metalclips

- Removed a check that was preventing metalclips from progressing past 1 clip on a target.

* Fix metalclips

- Fixed a bug limiting the metal clip count to one

* Improve MetalClips

- Fixed bug where shooting at a block spawned two clips
- Added ShootCooldown and CrushCooldown
- ShootCooldown only applies to shooting clips
- Changed how crushing works:
--- Removed old style and variables
--- When controlling an entity with 4 clips, the controller can click to
cause the armor to "crush" and damage the entity.
--- Has own cooldown, default of 2000 (2 seconds)
- Changed launching
--- Works with all clip amounts except 4
--- When the user releases sneak, the entity will be launched at varying
power depending on how many clips were attached.
- Changed ability cooldown to activate only after the ability is
finished.

* Add CrushDamage option to MetalClips

* New Damage Type, MetalClips changes

- Fixed MetalClips bug caused in magnetizing
- Added ignoreArmor option to damageEntity method, default true for most
abilities. If wanted to be changed, someone needs to go through and add
false as a parameter
- Changed default config option for MetalClips description

* PhaseChange recode

* Chris wanted changes

* Chris doesn't want bugs

* Only you can prevent bugs

- Added checks for worlds to prevent errors

* Remove unnecessary auto generated comments

* Loony didn't like the passive

* Added RegionProtection checks

* PhaseChange

* Revert "PhaseChange"

This reverts commit 761c73f5756771674719ffca52413cffa09243a8.

* Revert "Added RegionProtection checks"

This reverts commit b53a02a74d0276d4d1e773e1c197666cbcfab624.

* Revert "Loony didn't like the passive"

This reverts commit 6612bb7fa8eea3e26c01d0ef761c658447779e03.

* Revert "Remove unnecessary auto generated comments"

This reverts commit da9c45106d0b7e256c278e6a84d15f7a7340a140.

* Revert "Only you can prevent bugs"

This reverts commit 630161659ea89bfb106924c8ab1fbcdb8f6f1310.

* Revert "Chris doesn't want bugs"

This reverts commit eda2dee6b52dd38c73f35680c5e4484adc5b5b91.

* Revert "Chris wanted changes"

This reverts commit 30b76c10c4adc63784ea7115eb4f9c636650d6c5.

* Revert "PhaseChange recode"

This reverts commit f8f290dd8c57a3467a87de7e43b58ce635196c62.

* Conflicts

* Stupid conflicts

* I hope and pray

* Revert "Revert "Chris wanted changes""

This reverts commit e612607c8a16a735c92014714c00aa671954b4a5.

* Revert "Revert "Chris doesn't want bugs""

This reverts commit bd656b814d7ffa2d9c84fa304d3adb8f1535f782.

* Revert "Revert "Only you can prevent bugs""

This reverts commit 7772c95737130cf414ff1af49dcfb48865be5374.

* Revert "Revert "Remove unnecessary auto generated comments""

This reverts commit 69315dc7baa6cd237fbd89394e544913596ec6e3.

* Revert "Revert "Loony didn't like the passive""

This reverts commit ea397c6323e50d219395d5912850513afd6f2a7b.

* Revert "Revert "Added RegionProtection checks""

This reverts commit 8cb41709f65e4322e68b2f0e1792987f7fc214f2.

* Revert "Revert "PhaseChange""

This reverts commit da6b0e7071acf74df6447b15daf4ae6e39f057f6.

* Working PhaseChange finally

* Fix EarthGrab

* Air fixes, PhaseChange changes

* PhaseChange finalizing. Ready to go!

* Snow melting fix
---
 .../projectkorra/projectkorra/waterbending/PhaseChange.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/com/projectkorra/projectkorra/waterbending/PhaseChange.java b/src/com/projectkorra/projectkorra/waterbending/PhaseChange.java
index e0c63730..b6a9a313 100644
--- a/src/com/projectkorra/projectkorra/waterbending/PhaseChange.java
+++ b/src/com/projectkorra/projectkorra/waterbending/PhaseChange.java
@@ -358,7 +358,6 @@ public class PhaseChange extends IceAbility {
 		meltArea(center, meltRadius);
 	}
 	
-	@SuppressWarnings("deprecation")
 	public void melt(Block b) {
 		if (b.getWorld() != player.getWorld()) {
 			return;
@@ -404,10 +403,7 @@ public class PhaseChange extends IceAbility {
 			b.setType(m);
 			melted_blocks.add(b);
 		} else if (isSnow(b)) {
-			byte data = b.getData();
-			Material m = allowMeltFlow ? Material.WATER : Material.STATIONARY_WATER;
-			b.setType(m);
-			b.setData(data);
+			new TempBlock(b, Material.AIR, (byte)0);
 			melted_blocks.add(b);
 		}
 	}