EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename admin mode to override. Improve Rel names system.

Browse Source
This commit is contained in:
Olof Larsson
2016-02-02 19:03:11 +01:00
parent cb8aa093db
commit c8433a4770
23 changed files with 137 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/factions/integration/Econ.java
View File

@@ -31,7 +31,7 @@ public class Econ
if (!isEnabled()) return true;
if (cost == 0D) return true;
if (usender.isUsingAdminMode()) return true;
if (usender.isOverriding()) return true;
Faction usenderFaction = usender.getFaction();
@@ -72,7 +72,7 @@ public class Econ
if (me == null) return true;
// Always accept when in admin mode.
if (me instanceof MPlayer && ((MPlayer)me).isUsingAdminMode()) return true;
if (me instanceof MPlayer && ((MPlayer)me).isOverriding()) return true;
// Always accept control of self
if (me == you) return true;

4
src/com/massivecraft/factions/integration/worldguard/EngineWorldGuard.java
View File

@@ -81,8 +81,8 @@ public class EngineWorldGuard extends EngineAbstract
if ( ! MConf.get().worldguardCheckWorldsEnabled.contains(mplayer.getPlayer())) return;
// For admins don't bother checking
if (mplayer.isUsingAdminMode()) return;
// For overriders don't bother checking
if (mplayer.isOverriding()) return;
for (PS chunkChecking : event.getChunks())
{