TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-11-20 09:59:33 +00:00
Code Issues Projects Releases Wiki Activity

Fixed dodgy HeatControl melt on non-TempBlocks (#699)

Browse source
This commit is contained in:
Sobki 2017-01-17 14:58:13 +10:00 committed by Christopher Martin
parent 7e4ef6d5a2
commit 36c4094ed6
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/com/projectkorra/projectkorra/firebending/HeatControl.java
View file

@ -28,7 +28,6 @@ import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock; import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.SurgeWave; import com.projectkorra.projectkorra.waterbending.SurgeWave;
import com.projectkorra.projectkorra.waterbending.Torrent; import com.projectkorra.projectkorra.waterbending.Torrent;
import com.projectkorra.projectkorra.waterbending.WaterManipulation;
import com.projectkorra.projectkorra.waterbending.WaterSpoutWave; import com.projectkorra.projectkorra.waterbending.WaterSpoutWave;
import com.projectkorra.projectkorra.waterbending.combo.WaterCombo; import com.projectkorra.projectkorra.waterbending.combo.WaterCombo;
import com.projectkorra.projectkorra.waterbending.ice.PhaseChange; import com.projectkorra.projectkorra.waterbending.ice.PhaseChange;
@ -319,7 +318,7 @@ public class HeatControl extends FireAbility {
WaterSpoutWave.thaw(block); WaterSpoutWave.thaw(block);
WaterCombo.thaw(block); WaterCombo.thaw(block);
if (isMeltable(block) && !TempBlock.isTempBlock(block) && WaterManipulation.canPhysicsChange(block)) { if (isMeltable(block) && !TempBlock.isTempBlock(block)) {
if (block.getType() == Material.SNOW) { if (block.getType() == Material.SNOW) {
block.setType(Material.AIR); block.setType(Material.AIR);
return; return;