Merge pull request #302 from OmniCypher-/master

WaterWave NPE Fix
This commit is contained in:
OmniCypher 2015-11-18 16:03:09 -08:00
commit f17080ca47

View file

@ -86,6 +86,10 @@ public class WaterWave {
remove();
return;
}
if (origin != null && !player.getWorld().equals(origin.getWorld())) {
remove();
return;
}
if (type != AbilityType.RELEASE) {
if (!GeneralMethods.canBend(player.getName(), "WaterSpout") || !player.hasPermission("bending.ability.WaterSpout.Wave")) {
remove();