This commit is contained in:
MistPhizzle 2014-06-13 19:41:52 -04:00
parent 0180332f4e
commit 43dcd5aae5
4 changed files with 7 additions and 1 deletions

View file

@ -8,5 +8,6 @@
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/LocalServer/plugins/ProjectKorra/Abilities/WaterManipulation.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/LocalServer/plugins/ProjectKorra/Abilities/OctopusForm.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/LocalServer/plugins/ProjectKorra/Abilities/PhaseChange.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/LocalServer/plugins/ProjectKorra/Abilities/Surge.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

View file

@ -29,6 +29,7 @@ public class ConfigManager {
earthbendable.add("SANDSTONE");
plugin.getConfig().addDefault("Properties.GlobalCooldown", 500);
plugin.getConfig().addDefault("Properties.SeaLevel", 62);
plugin.getConfig().addDefault("Properties.Air.CanBendWithWeapons", false);

View file

@ -14,6 +14,8 @@ import org.bukkit.util.Vector;
import com.projectkorra.ProjectKorra.Methods;
import com.projectkorra.ProjectKorra.TempBlock;
import com.projectkorra.abilities.OctopusForm.OctopusFormAbility;
import com.projectkorra.abilities.Surge.WaterWall;
import com.projectkorra.abilities.Surge.Wave;
import com.projectkorra.abilities.WaterManipulation.WaterManipulationAbility;
public class WaterReturn {
@ -155,7 +157,8 @@ public class WaterReturn {
private static boolean isBending(Player player) {
if (Methods.isAbilityInstalled("WaterManipulation", "orion304")) {
for (int id : WaterManipulationAbility .instances.keySet()) {
if (WaterManipulationAbility.instances.get(id).player.equals(player))
WaterManipulationAbility.instances.get(id);
if (WaterManipulationAbility.player.equals(player))
return true;
}
}

View file

@ -1,5 +1,6 @@
Properties:
GlobalCooldown: 500
SeaLevel: 62
Chat:
ChatPrefixes: true
AirPrefix: "[&7Air&f]"