WaterWave NPE Fix

Fixes WaterWave origin NPE.
This commit is contained in:
OmniCypher 2015-11-18 16:01:12 -08:00
parent e1bbc6ea7f
commit 3287e891c1

View file

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