TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-15 05:17:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #302 from OmniCypher-/master

Browse source 
WaterWave NPE Fix
This commit is contained in:
OmniCypher 2015-11-18 16:03:09 -08:00
commit f17080ca47
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/com/projectkorra/projectkorra/waterbending/WaterWave.java
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();