EdenEternal Posted July 23, 2010 Share Posted July 23, 2010 Config for Enable/Disable GM's from receive PvP or PK Points. Index: trunk/L2jLive_GameServer/java/com/l2jserver/Config.java =================================================================== --- /tmp/svn_fs20100723-29611-1pwj9a7-0 Fri Jul 23 15:20:08 2010 +++ /tmp/svn_fs20100723-29611-1ohlj7v-0 Fri Jul 23 15:20:08 2010 @@ -238,6 +238,7 @@ public static boolean ENABLE_BOTREPORT; public static boolean ENABLE_PVP_HERO_SYSTEM; public static int PVP_HERO_SYSTEM_AMOUNT; + public static boolean GM_CAN_RECEIVE_PVP_PK_POINTS; /** ************************************************** **/ /** L2jLive Settings End **/ @@ -2050,6 +2051,7 @@ GM_SKILL_RESTRICTION = Boolean.parseBoolean(General.getProperty("GMSkillRestriction", "True")); GM_TRADE_RESTRICTED_ITEMS = Boolean.parseBoolean(General.getProperty("GMTradeRestrictedItems", "False")); GM_RESTART_FIGHTING = Boolean.parseBoolean(General.getProperty("GMRestartFighting", "True")); + GM_CAN_RECEIVE_PVP_PK_POINTS = Boolean.parseBoolean(General.getProperty("GMCanReceivePvPPKPoints", "True")); BYPASS_VALIDATION = Boolean.parseBoolean(General.getProperty("BypassValidation", "True")); GAMEGUARD_ENFORCE = Boolean.parseBoolean(General.getProperty("GameGuardEnforce", "False")); GAMEGUARD_PROHIBITACTION = Boolean.parseBoolean(General.getProperty("GameGuardProhibitAction", "False")); Index: trunk/L2jLive_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java =================================================================== --- /tmp/svn_fs20100723-29611-1w64ebg-0 Fri Jul 23 15:20:08 2010 +++ /tmp/svn_fs20100723-29611-1kvmpfw-0 Fri Jul 23 15:20:08 2010 @@ -308,7 +308,7 @@ // Character PremiumService String Definitions: private static final String INSERT_PREMIUMSERVICE = "INSERT INTO account_premium (account_name,premium_service,enddate) values(?,?,?)"; private static final String RESTORE_PREMIUMSERVICE = "SELECT premium_service,enddate FROM account_premium WHERE account_name=?"; - private static final String UPDATE_PREMIUMSERVICE = "UPDATE account_premium SET premium_service=?,enddate=? WHERE account_name=?"; + private static final String UPDATE_PREMIUMSERVICE = "UPDATE account_premium SET premium_service=?,enddate=? WHERE account_name=?"; public static final int REQUEST_TIMEOUT = 15; public static final int STORE_PRIVATE_NONE = 0; @@ -5888,6 +5888,9 @@ if (CTF._started && _inEventCTF) return; + if (Config.GM_CAN_RECEIVE_PVP_PK_POINTS && isGM()) + return; + // Add karma to attacker and increase its PK counter setPvpKills(getPvpKills() + 1); @@ -5908,6 +5911,9 @@ if (CTF._started && _inEventCTF) return; + if (Config.GM_CAN_RECEIVE_PVP_PK_POINTS && isGM()) + return; + int baseKarma = Config.KARMA_MIN_KARMA; int newKarma = baseKarma; int karmaLimit = Config.KARMA_MAX_KARMA; @@ -14721,7 +14727,7 @@ */ public void setPvpColor() { - if (Config.PVP_COLOR_SYSTEM && _pvpKills >= Config.PVP_COLOR_SYSTEM_PVP_AMOUNT1 && !isGM()) + if (!isGM() && !isDonator() && Config.PVP_COLOR_SYSTEM && _pvpKills >= Config.PVP_COLOR_SYSTEM_PVP_AMOUNT1) { if (_pvpKills >= Config.PVP_COLOR_SYSTEM_PVP_AMOUNT1 && _pvpKills < Config.PVP_COLOR_SYSTEM_PVP_AMOUNT2) { Index: trunk/L2jLive_GameServer/java/config/General.properties =================================================================== --- /tmp/svn_fs20100723-29611-1fyvnbd-0 Fri Jul 23 15:20:08 2010 +++ /tmp/svn_fs20100723-29611-rx9m9u-0 Fri Jul 23 15:20:08 2010 @@ -75,6 +75,10 @@ # Default: True GMRestartFighting = True +# Allow GM's to receive PvP/PK Points. +# Default: True +GMCanReceivePvPPKPoints = True + # --------------------------------------------------------------------------- # Server Security # --------------------------------------------------------------------------- Credit to L2jLive Quote Link to comment Share on other sites More sharing options...
Intrepid Posted July 23, 2010 Share Posted July 23, 2010 again timeline c/p and useless share-.-" Quote Link to comment Share on other sites More sharing options...
EdenEternal Posted July 23, 2010 Author Share Posted July 23, 2010 again timeline c/p and useless share-.-" of course it's from timeline i write the credits of L2jLive... btw why is useless? Quote Link to comment Share on other sites More sharing options...
Intrepid Posted July 23, 2010 Share Posted July 23, 2010 of course it's from timeline i write the credits of L2jLive... btw why is useless? this option as it is have no point to be in any pack no usefull way to use Quote Link to comment Share on other sites More sharing options...
Coyote™ Posted July 23, 2010 Share Posted July 23, 2010 Are you going to spam the whole section with this project's commits/contributions ? Quote Link to comment Share on other sites More sharing options...
EdenEternal Posted July 23, 2010 Author Share Posted July 23, 2010 Are you going to spam the whole section with this project's commits/contributions ? no i just to share configs and etc. Quote Link to comment Share on other sites More sharing options...
Recommended Posts
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.
Note: Your post will require moderator approval before it will be visible.