Fixed /deletealladminclaims NPE (really).

This commit is contained in:
ryanhamshire 2014-12-04 19:14:38 -08:00
parent f80d1fa4d1
commit 7a0fa0d05a
2 changed files with 2 additions and 2 deletions

View File

@ -918,7 +918,7 @@ public abstract class DataStore
for(int i = 0; i < this.claims.size(); i++)
{
Claim claim = this.claims.get(i);
if((playerID == claim.ownerID || playerID.equals(claim.ownerID)) && (deleteCreativeClaims || !GriefPrevention.instance.creativeRulesApply(claim.getLesserBoundaryCorner())))
if((playerID == claim.ownerID || (playerID != null && playerID.equals(claim.ownerID))) && (deleteCreativeClaims || !GriefPrevention.instance.creativeRulesApply(claim.getLesserBoundaryCorner())))
claimsToDelete.add(claim);
}

View File

@ -1683,7 +1683,7 @@ public class GriefPrevention extends JavaPlugin
}
//deletealladminclaims
else if(cmd.getName().equalsIgnoreCase("deletealladminclaims"))
else if(player != null && cmd.getName().equalsIgnoreCase("deletealladminclaims"))
{
if(!player.hasPermission("griefprevention.deleteclaims"))
{