Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-29 05:36:28 +01:00
Code Issues Projects Releases Wiki Activity

Permission System Improvements

Browse Source
This commit is contained in:
Olof Larsson 2016-06-16 19:25:07 +02:00
parent 3b8e54baec
commit 965911d3de
No known key found for this signature in database
GPG Key ID: BBEF14F97DA52474
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/massivecraft/factions/Perm.java
View File

@ -110,14 +110,14 @@ public enum Perm implements Identified
// HAS // HAS
// -------------------------------------------- // // -------------------------------------------- //
public boolean has(Permissible permissible, boolean informSenderIfNot) public boolean has(Permissible permissible, boolean verboose)
{ {
return PermissionUtil.hasPermission(permissible, this.id, informSenderIfNot); return PermissionUtil.hasPermission(permissible, this, verboose);
} }
public boolean has(Permissible permissible) public boolean has(Permissible permissible)
{ {
return has(permissible, false); return PermissionUtil.hasPermission(permissible, this);
} }
} }

3
src/com/massivecraft/factions/entity/MPlayer.java
View File

@ -544,8 +544,7 @@ public class MPlayer extends SenderEntity<MPlayer> implements EconomyParticipato
if (this.overriding == null) return false; if (this.overriding == null) return false;
if (this.overriding == false) return false; if (this.overriding == false) return false;
// Deactivate admin mode if we don't have permissions for it. if (!this.hasPermission(Perm.OVERRIDE, true))
if (this.getSender() != null && ! Perm.OVERRIDE.has(this.getSender(), false))
{ {
this.setOverriding(false); this.setOverriding(false);
return false; return false;