rendered paste bodyIndex: D:/olympus/trunk/L2_Gameserver/java/config/GMAccess.properties
===================================================================
--- D:/olympus/trunk/L2_Gameserver/java/config/GMAccess.properties (revision 2007)
+++ D:/olympus/trunk/L2_Gameserver/java/config/GMAccess.properties (working copy)
@@ -1,6 +1,7 @@
# Configure GM AccessLevels
GMAccessLevel = 100
GMMinLevel = 100
+GMAdminLevel = 75
GMCanAnnounce = 100
GMCanBan = 100
GMCanBanChat = 100
Index: D:/olympus/trunk/L2_Gameserver/java/net/sf/l2j/Config.java
===================================================================
--- D:/olympus/trunk/L2_Gameserver/java/net/sf/l2j/Config.java (revision 2007)
+++ D:/olympus/trunk/L2_Gameserver/java/net/sf/l2j/Config.java (working copy)
@@ -196,6 +196,8 @@
/** General GM Minimal AccessLevel */
public static int GM_MIN;
/** General GM AccessLevel to change announcements */
+ public static int GM_ADMIN;
+ /** General GM Admin AccessLevel */
public static int GM_ANNOUNCE;
/** General GM AccessLevel can /ban /unban */
public static int GM_BAN;
@@ -1284,6 +1286,7 @@
GM_ACCESSLEVEL = Integer.parseInt(gmSettings.getProperty("GMAccessLevel", "100"));
GM_MIN = Integer.parseInt(gmSettings.getProperty("GMMinLevel", "100"));
+ GM_ADMIN = Integer.parseInt(gmSettings.getProperty("GMAdminLevel", "75"));
GM_ANNOUNCE = Integer.parseInt(gmSettings.getProperty("GMCanAnnounce", "100"));
GM_BAN = Integer.parseInt(gmSettings.getProperty("GMCanBan", "100"));
GM_BAN_CHAT = Integer.parseInt(gmSettings.getProperty("GMCanBanChat", "100"));
@@ -1389,6 +1392,7 @@
LOGIN_TRY_BEFORE_BAN = Integer.parseInt(serverSettings.getProperty("LoginTryBeforeBan", "10"));
GM_MIN = Integer.parseInt(serverSettings.getProperty("GMMinLevel", "100"));
+ GM_ADMIN = Integer.parseInt(serverSettings.getProperty("GMAdminLevel", "75"));
DATAPACK_ROOT = new File(serverSettings.getProperty("DatapackRoot", ".")).getCanonicalFile(); //FIXME: in login?
Index: D:/olympus/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/clientpackets/EnterWorld.java
===================================================================
--- D:/olympus/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/clientpackets/EnterWorld.java (revision 2007)
+++ D:/olympus/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/clientpackets/EnterWorld.java (working copy)
@@ -118,9 +118,9 @@
if (Config.GM_NAME_COLOR_ENABLED)
{
- if (activeChar.getAccessLevel() >= 100)
+ if (activeChar.getAccessLevel() >= Config.GM_MIN)
activeChar.setNameColor(Config.ADMIN_NAME_COLOR);
- else if (activeChar.getAccessLevel() >= 75)
+ else if (activeChar.getAccessLevel() >= Config.GM_ADMIN)
activeChar.setNameColor(Config.GM_NAME_COLOR);
}
}