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

Fix both #32 and #40

Browse Source
This commit is contained in:
Magnus Ulf 2020-01-14 23:49:38 +01:00
parent e7dc6bd2c2
commit 8e169ea269
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/massivecraft/factions/TerritoryAccess.java
View File

@ -42,7 +42,7 @@ public class TerritoryAccess
// The simple ones // The simple ones
public TerritoryAccess withHostFactionId(String hostFactionId) { return valueOf(hostFactionId, hostFactionAllowed, grantedIds); } public TerritoryAccess withHostFactionId(String hostFactionId) { return valueOf(hostFactionId, hostFactionAllowed, grantedIds); }
public TerritoryAccess withHostFactionAllowed(Boolean hostFactionAllowed) { return valueOf(hostFactionId, hostFactionAllowed, grantedIds); } public TerritoryAccess withHostFactionAllowed(Boolean hostFactionAllowed) { return valueOf(hostFactionId, hostFactionAllowed, grantedIds); }
public TerritoryAccess withGrantedIds(Collection<String> factionIds) { return valueOf(hostFactionId, hostFactionAllowed, grantedIds); } public TerritoryAccess withGrantedIds(Collection<String> grantedIds) { return valueOf(hostFactionId, hostFactionAllowed, grantedIds); }
// The intermediate ones // The intermediate ones
public TerritoryAccess withGranted(MPermable mpermable, boolean with) public TerritoryAccess withGranted(MPermable mpermable, boolean with)
@ -142,7 +142,7 @@ public class TerritoryAccess
public boolean isGranted(String permableId) public boolean isGranted(String permableId)
{ {
//if (permableId.equals(this.hostFactionId)) return this.isHostFactionAllowed(); if (permableId.equals(this.hostFactionId)) return this.isHostFactionAllowed();
return this.getGrantedIds().contains(permableId); return this.getGrantedIds().contains(permableId);
} }
@ -160,11 +160,15 @@ public class TerritoryAccess
public AccessStatus getTerritoryAccess(MPlayer mplayer) public AccessStatus getTerritoryAccess(MPlayer mplayer)
{ {
if (isGranted(mplayer.getId())) return AccessStatus.ELEVATED; if (isGranted(mplayer.getId())) return AccessStatus.ELEVATED;
if (isGranted(mplayer.getFaction().getId())) return AccessStatus.ELEVATED;
if (isGranted(mplayer.getRank().getId())) return AccessStatus.ELEVATED; if (isGranted(mplayer.getRank().getId())) return AccessStatus.ELEVATED;
if (isGranted(RelationUtil.getRelationOfThatToMe(mplayer, this.getHostFaction()).toString())) return AccessStatus.ELEVATED;
if (this.getHostFactionId().equals(mplayer.getFaction().getId()) && !this.isHostFactionAllowed()) return AccessStatus.DECREASED; if (this.getHostFactionId().equals(mplayer.getFaction().getId()))
{
if (this.isHostFactionAllowed()) return AccessStatus.STANDARD;
else return AccessStatus.DECREASED;
}
if (isGranted(mplayer.getFaction().getId())) return AccessStatus.ELEVATED;
if (isGranted(RelationUtil.getRelationOfThatToMe(mplayer, this.getHostFaction()).toString())) return AccessStatus.ELEVATED;
return AccessStatus.STANDARD; return AccessStatus.STANDARD;
} }