TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 11:40:40 +00:00
Code Issues Projects Releases Wiki Activity

Fixed Healing waters & /b d Combustion issue

Browse source
This commit is contained in:
OmniCypher 2015-06-28 15:16:06 -07:00
parent cdc9f7ad80
commit bf59be3d78
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/projectkorra/ProjectKorra/Commands.java
View file

@ -892,6 +892,7 @@ public class Commands {
s.sendMessage(GeneralMethods.getSubBendingColor(Element.Fire) + st);
}
}
return true;
}
if (Arrays.asList(combustionaliases).contains(args[1])) {
@ -905,6 +906,7 @@ public class Commands {
s.sendMessage(GeneralMethods.getSubBendingColor(Element.Fire) + st);
}
}
return true;
}
if (Arrays.asList(chialiases).contains(args[1])) {

3
src/com/projectkorra/ProjectKorra/GeneralMethods.java
View file

@ -1194,8 +1194,7 @@ public class GeneralMethods {
for (double i = 0; i <= max; i++) {
loc = location1.clone().add(direction.clone().multiply(i));
Material type = loc.getBlock().getType();
if (type != Material.AIR
&& !Arrays.asList(EarthMethods.getTransparentEarthbending()).contains(type.getId()))
if (type != Material.AIR && !(Arrays.asList(EarthMethods.getTransparentEarthbending()).contains(type.getId()) || WaterMethods.isWater(loc.getBlock())))
return true;
}
return false;

1
src/com/projectkorra/ProjectKorra/waterbending/HealingWaters.java
View file

@ -2,6 +2,7 @@ package com.projectkorra.ProjectKorra.waterbending;
import java.util.ArrayList;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;