Fixed Bug with Points

This commit is contained in:
Driftay 2019-08-07 12:05:20 -04:00
parent 664d27a57c
commit 92d46f91f4
2 changed files with 6 additions and 4 deletions

@ -415,7 +415,7 @@ public class Conf {
safeZoneNerfedCreatureTypes.add(EntityType.WITCH); safeZoneNerfedCreatureTypes.add(EntityType.WITCH);
safeZoneNerfedCreatureTypes.add(EntityType.WITHER); safeZoneNerfedCreatureTypes.add(EntityType.WITHER);
safeZoneNerfedCreatureTypes.add(EntityType.ZOMBIE); safeZoneNerfedCreatureTypes.add(EntityType.ZOMBIE);
// Is this called lazy load? // Is this called lazy load?
defaultFactionPermissions.put("LEADER", new DefaultPermissions(true)); defaultFactionPermissions.put("LEADER", new DefaultPermissions(true));
defaultFactionPermissions.put("COLEADER", new DefaultPermissions(true)); defaultFactionPermissions.put("COLEADER", new DefaultPermissions(true));

@ -37,9 +37,11 @@ public class CmdPointsAdd extends FCommand {
public void perform() { public void perform() {
Faction faction = Factions.getInstance().getByTag(args.get(0)); Faction faction = Factions.getInstance().getByTag(args.get(0));
FPlayer fPlayer = this.argAsFPlayer(0); if (faction == null) {
if (fPlayer != null) { FPlayer fPlayer = this.argAsFPlayer(0);
faction = fPlayer.getFaction(); if (fPlayer != null) {
faction = fPlayer.getFaction();
}
} }
if (faction == null || faction.isWilderness()) { if (faction == null || faction.isWilderness()) {