Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- ### Eclipse Workspace Patch 1.0
- #P L2jFanatic_GameServer
- Index: head-src/com/l2jfrozen/gameserver/model/entity/olympiad/Olympiad.java
- ===================================================================
- --- head-src/com/l2jfrozen/gameserver/model/entity/olympiad/Olympiad.java (revision 26)
- +++ head-src/com/l2jfrozen/gameserver/model/entity/olympiad/Olympiad.java (working copy)
- @@ -420,6 +420,21 @@
- }
- /** Begin Olympiad Restrictions */
- + if(Config.OLY_PARTICIPATION_BY_PVP || Config.OLY_PARTICIPATION_BY_PK)
- + {
- + String count = String.valueOf(Config.OLY_PARTICIPATION_COUNT);
- + if(Config.OLY_PARTICIPATION_BY_PVP && noble.getPvpKills() <= Config.OLY_PARTICIPATION_COUNT)
- + {
- + noble.sendMessage("Cant register when you have less than " + count + " Pvp Kills.");
- + return false;
- + }
- + else if(Config.OLY_PARTICIPATION_BY_PK && noble.getPkKills() <= Config.OLY_PARTICIPATION_COUNT)
- + {
- + noble.sendMessage("Cant register when you have less than " + count + " Pk Kills.");
- + return false;
- + }
- + }
- +
- if (noble.getBaseClass() != noble.getClassId().getId())
- {
- sm = new SystemMessage(SystemMessageId.YOU_CANT_JOIN_THE_OLYMPIAD_WITH_A_SUB_JOB_CHARACTER);
- Index: config/head/olympiad.properties
- ===================================================================
- --- config/head/olympiad.properties (revision 26)
- +++ config/head/olympiad.properties (working copy)
- @@ -100,4 +100,11 @@
- # es. 2weeks-->AltOlyPeriod=WEEK and AltOlyPeriodMultiplier=2
- AltOlyUseCustomPeriodSettings = False
- AltOlyPeriod = MONTH
- -AltOlyPeriodMultiplier = 1
- \ No newline at end of file
- +AltOlyPeriodMultiplier = 1
- +
- +# Basic requirements to participate in the Olympic game
- +# Options: None, All, Pvp, PK
- +OlympiadParticipationRelated = None
- +# Sets the amount required to participate in the Olympics game.
- +# Note: Only Works if OlympiadParticipationRelated equals All, Pvp or PK!
- +OlympiadPartipationCount = 100
- Index: head-src/com/l2jfrozen/Config.java
- ===================================================================
- --- head-src/com/l2jfrozen/Config.java (revision 29)
- +++ head-src/com/l2jfrozen/Config.java (working copy)
- @@ -2584,6 +2584,10 @@
- public static boolean ALT_OLY_USE_CUSTOM_PERIOD_SETTINGS;
- public static OlympiadPeriod ALT_OLY_PERIOD;
- public static int ALT_OLY_PERIOD_MULTIPLIER;
- +
- + public static boolean OLY_PARTICIPATION_BY_PVP;
- + public static boolean OLY_PARTICIPATION_BY_PK;
- + public static int OLY_PARTICIPATION_COUNT;
- //============================================================
- public static void loadOlympConfig()
- @@ -2640,7 +2644,9 @@
- ALT_OLY_PERIOD = OlympiadPeriod.valueOf(OLYMPSetting.getProperty("AltOlyPeriod", "MONTH"));
- ALT_OLY_PERIOD_MULTIPLIER = Integer.parseInt(OLYMPSetting.getProperty("AltOlyPeriodMultiplier", "1"));
- -
- + OLY_PARTICIPATION_BY_PVP = OLYMPSetting.getProperty("OlympiadParticipationRelated", "All").equalsIgnoreCase("pvp") || OLYMPSetting.getProperty("OlympiadParticipationRelated", "All").equalsIgnoreCase("all");
- + OLY_PARTICIPATION_BY_PK = OLYMPSetting.getProperty("OlympiadParticipationRelated", "All").equalsIgnoreCase("pk") || OLYMPSetting.getProperty("OlympiadParticipationRelated", "All").equalsIgnoreCase("all");
- + OLY_PARTICIPATION_COUNT = Integer.parseInt(OLYMPSetting.getProperty("OlympiadPartipationCount", "100"));
- }
- catch(Exception e)
- {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement