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

Revert "Revert "Try to fix FreezeMelt NPE""

Browse source 
This reverts commit 287006936a.
This commit is contained in:
MistPhizzle 2014-07-13 16:41:00 -04:00
parent 287006936a
commit 676a794ba1
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Dev Builds/Korra.jar
View file

Binary file not shown.

5
src/com/projectkorra/ProjectKorra/waterbending/FreezeMelt.java
View file

@ -91,7 +91,10 @@ public class FreezeMelt {
public static boolean canThaw(Block block) { public static boolean canThaw(Block block) {
if (frozenblocks.containsKey(block)) { if (frozenblocks.containsKey(block)) {
for (Player player : block.getWorld().getPlayers()) { for (Player player : block.getWorld().getPlayers()) {
if (Methods.getBoundAbility(player) != null && Methods.getBoundAbility(player).equalsIgnoreCase("OctopusForm")) { if (Methods.getBoundAbility(player) == null) {
return true;
}
if (Methods.getBoundAbility(player).equalsIgnoreCase("OctopusForm")) {
if (block.getLocation().distance(player.getLocation()) <= OctopusForm.radius + 2) if (block.getLocation().distance(player.getLocation()) <= OctopusForm.radius + 2)
return false; return false;
} }