TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-23 00:15:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #457 from OmniCypher-/master

Browse source 
Fixes part of PlantArmor and EarthRevert
This commit is contained in:
OmniCypher 2016-03-26 18:16:40 -07:00
commit 6dcb920c90
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/com/projectkorra/projectkorra/ability/EarthAbility.java
View file

@ -252,6 +252,7 @@ public abstract class EarthAbility extends ElementalAbility {
info = new Information(); info = new Information();
info.setBlock(block); info.setBlock(block);
info.setState(block.getState());
info.setData(block.getData()); info.setData(block.getData());
} }
block.setType(Material.AIR); block.setType(Material.AIR);
@ -536,7 +537,7 @@ public abstract class EarthAbility extends ElementalAbility {
} }
Information info = TEMP_AIR_LOCATIONS.get(i); Information info = TEMP_AIR_LOCATIONS.get(i);
Block block = info.getBlock(); Block block = info.getState().getBlock();
if (block.getType() != Material.AIR && !block.isLiquid()) { if (block.getType() != Material.AIR && !block.isLiquid()) {
if (force || !MOVED_EARTH.containsKey(block)) { if (force || !MOVED_EARTH.containsKey(block)) {

2
src/com/projectkorra/projectkorra/ability/WaterAbility.java
View file

@ -249,7 +249,7 @@ public abstract class WaterAbility extends ElementalAbility {
} }
public static boolean isLeaves(Material material) { public static boolean isLeaves(Material material) {
return material == Material.LEAVES || material == Material.LEAVES; return material == Material.LEAVES || material == Material.LEAVES_2;
} }
public static boolean isSnow(Block block) { public static boolean isSnow(Block block) {