Browse Source

skill restriction for GM

janiii 16 years ago
parent
commit
39253cdc42

+ 3 - 0
L2_GameServer/java/config/General.properties

@@ -65,6 +65,9 @@ GMAdminMenuStyle = modern
 # Item restrictions apply to GMs aswell?
 GmItemRestriction = False
 
+# Skill restrictions apply to GMs aswell?
+GmSkillRestriction = False
+
 
 # ---------------------------------------------------------------------------
 # Server Security

+ 2 - 0
L2_GameServer/java/net/sf/l2j/Config.java

@@ -333,6 +333,7 @@ public final class Config
 	public static boolean GM_STARTUP_DIET_MODE;
 	public static String GM_ADMIN_MENU_STYLE;
 	public static boolean GM_ITEM_RESTRICTION;
+	public static boolean GM_SKILL_RESTRICTION;
 	public static boolean BYPASS_VALIDATION;
 	public static boolean GAMEGUARD_ENFORCE;
 	public static boolean GAMEGUARD_PROHIBITACTION;
@@ -1333,6 +1334,7 @@ public final class Config
 					GM_STARTUP_DIET_MODE = Boolean.parseBoolean(General.getProperty("GMStartupDietMode", "False"));
 					GM_ADMIN_MENU_STYLE = General.getProperty("GMAdminMenuStyle", "modern");
 					GM_ITEM_RESTRICTION = Boolean.parseBoolean(General.getProperty("GmItemRestriction", "False"));
+					GM_SKILL_RESTRICTION = Boolean.parseBoolean(General.getProperty("GmSkillRestriction", "False"));
 					BYPASS_VALIDATION = Boolean.parseBoolean(General.getProperty("BypassValidation", "True"));
 					GAMEGUARD_ENFORCE = Boolean.parseBoolean(General.getProperty("GameGuardEnforce", "True"));
 					GAMEGUARD_PROHIBITACTION = Boolean.parseBoolean(General.getProperty("GameGuardProhibitAction", "True"));

+ 2 - 0
L2_GameServer/java/net/sf/l2j/gameserver/model/L2Skill.java

@@ -1237,6 +1237,8 @@ public abstract class L2Skill implements IChanceSkillTrigger
 
     public boolean checkCondition(L2Character activeChar, L2Object target, boolean itemOrWeapon)
     {
+        if (activeChar.isGM() && !Config.GM_SKILL_RESTRICTION)
+            return true;
         if ((getCondition() & L2Skill.COND_SHIELD) != 0)
         {
             /*