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

Merge pull request #379 from jedk1/master

Browse source 
Fix NPE in EarthSmash
This commit is contained in:
OmniCypher 2016-01-12 15:15:51 -08:00
parent 091f381def 4c549f6e78
commit 2e69f4142f
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/com/projectkorra/projectkorra/command/RemoveCommand.java
View file

@ -43,6 +43,7 @@ public class RemoveCommand extends PKCommand {
return;
}
sender.sendMessage(GeneralMethods.getElementColor(e) + "You have removed your " + e.toString().toLowerCase() + "bending.");
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, (Player) sender, e, Result.REMOVE));
return;
} else {
sender.sendMessage(ChatColor.RED + "You do not have that element!");

3
src/com/projectkorra/projectkorra/earthbending/EarthSmash.java
View file

@ -503,6 +503,9 @@ public class EarthSmash {
for (EarthSmash smash : instances) {
if (reqState == null || smash.state == reqState)
for (Block block : blocks) {
if (block == null || smash.loc == null) {
continue;
}
if (block.getLocation().getWorld() == smash.loc.getWorld() && block.getLocation().distanceSquared(smash.loc) <= Math.pow(2.5, 2))
return smash;
}