TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-12 03:59:06 +00:00
Code Issues Projects Releases Wiki Activity

Fix BendingPlayer NPE of player log out

Browse source
This commit is contained in:
jedk1 2015-11-25 21:23:27 +00:00
parent 06b999c6c6
commit 4b85875c18
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/com/projectkorra/projectkorra/airbending/AirBlast.java
View file

@ -130,6 +130,9 @@ public class AirBlast implements ConfigLoadable {
if (!origins.containsKey(player)) if (!origins.containsKey(player))
return; return;
Location origin = origins.get(player); Location origin = origins.get(player);
if (player.isDead() || !player.isOnline())
return;
if (!origin.getWorld().equals(player.getWorld())) { if (!origin.getWorld().equals(player.getWorld())) {
origins.remove(player); origins.remove(player);
return; return;

5
src/com/projectkorra/projectkorra/airbending/AirSpout.java
View file

@ -94,10 +94,9 @@ public class AirSpout implements ConfigLoadable {
} }
public boolean progress() { public boolean progress() {
if (!GeneralMethods.canBend(player.getName(), "AirSpout") if (player.isDead() || !player.isOnline() || !GeneralMethods.canBend(player.getName(), "AirSpout")
// || !Methods.hasAbility(player, Abilities.AirSpout) // || !Methods.hasAbility(player, Abilities.AirSpout)
|| player.getEyeLocation().getBlock().isLiquid() || GeneralMethods.isSolid(player.getEyeLocation().getBlock()) || player.getEyeLocation().getBlock().isLiquid() || GeneralMethods.isSolid(player.getEyeLocation().getBlock())) {
|| player.isDead() || !player.isOnline()) {
remove(); remove();
return false; return false;
} }

3
src/com/projectkorra/projectkorra/airbending/AirSuction.java
View file

@ -103,6 +103,9 @@ public class AirSuction implements ConfigLoadable {
if (!origins.containsKey(player)) if (!origins.containsKey(player))
return; return;
Location origin = origins.get(player); Location origin = origins.get(player);
if (player.isDead() || !player.isOnline())
return;
if (!origin.getWorld().equals(player.getWorld())) { if (!origin.getWorld().equals(player.getWorld())) {
origins.remove(player); origins.remove(player);
return; return;