Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some NPE evasion and checking

Browse Source
This commit is contained in:
Olof Larsson 2014-10-03 11:48:25 +02:00
parent 636e72ee67
commit d0a2133976
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/massivecraft/factions/entity/MPerm.java
View File

@ -4,6 +4,8 @@ import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import org.bukkit.entity.Player;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel; import com.massivecraft.factions.Rel;
@ -245,26 +247,44 @@ public class MPerm extends Entity<MPerm> implements Prioritized, Registerable
public String createDeniedMessage(MPlayer mplayer, Faction hostFaction) public String createDeniedMessage(MPlayer mplayer, Faction hostFaction)
{ {
// Null Check
if (mplayer == null) throw new NullPointerException("mplayer");
if (hostFaction == null) throw new NullPointerException("hostFaction");
String ret = Txt.parse("%s<b> does not allow you to %s<b>.", hostFaction.describeTo(mplayer, true), this.getDesc()); String ret = Txt.parse("%s<b> does not allow you to %s<b>.", hostFaction.describeTo(mplayer, true), this.getDesc());
if (Perm.ADMIN.has(mplayer.getPlayer()))
Player player = mplayer.getPlayer();
if (player != null && Perm.ADMIN.has(player))
{ {
ret += Txt.parse("\n<i>You can bypass by using " + Factions.get().getOuterCmdFactions().cmdFactionsAdmin.getUseageTemplate(false)); ret += Txt.parse("\n<i>You can bypass by using " + Factions.get().getOuterCmdFactions().cmdFactionsAdmin.getUseageTemplate(false));
} }
return ret; return ret;
} }
public boolean has(Faction faction, Faction hostFaction) public boolean has(Faction faction, Faction hostFaction)
{ {
// Null Check
if (faction == null) throw new NullPointerException("faction");
if (hostFaction == null) throw new NullPointerException("hostFaction");
Rel rel = faction.getRelationTo(hostFaction); Rel rel = faction.getRelationTo(hostFaction);
return hostFaction.getPermittedRelations(this).contains(rel);
Set<Rel> permittedRelations = hostFaction.getPermittedRelations(this);
return permittedRelations.contains(rel);
} }
public boolean has(MPlayer mplayer, Faction hostFaction, boolean verboose) public boolean has(MPlayer mplayer, Faction hostFaction, boolean verboose)
{ {
// Null Check
if (mplayer == null) throw new NullPointerException("mplayer");
if (hostFaction == null) throw new NullPointerException("hostFaction");
if (mplayer.isUsingAdminMode()) return true; if (mplayer.isUsingAdminMode()) return true;
Rel rel = mplayer.getRelationTo(hostFaction); Rel rel = mplayer.getRelationTo(hostFaction);
if (hostFaction.getPermittedRelations(this).contains(rel)) return true; Set<Rel> permittedRelations = hostFaction.getPermittedRelations(this);
if (permittedRelations.contains(rel)) return true;
if (verboose) mplayer.sendMessage(this.createDeniedMessage(mplayer, hostFaction)); if (verboose) mplayer.sendMessage(this.createDeniedMessage(mplayer, hostFaction));
@ -273,6 +293,10 @@ public class MPerm extends Entity<MPerm> implements Prioritized, Registerable
public boolean has(MPlayer mplayer, PS ps, boolean verboose) public boolean has(MPlayer mplayer, PS ps, boolean verboose)
{ {
// Null Check
if (mplayer == null) throw new NullPointerException("mplayer");
if (ps == null) throw new NullPointerException("ps");
if (mplayer.isUsingAdminMode()) return true; if (mplayer.isUsingAdminMode()) return true;
TerritoryAccess ta = BoardColl.get().getTerritoryAccessAt(ps); TerritoryAccess ta = BoardColl.get().getTerritoryAccessAt(ps);