Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- ### Eclipse Workspace Patch 1.0
- #P L2J_Mobius_10.3_MasterClass
- diff --git dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
- index dde2731..60988ec 100644
- --- dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
- +++ dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
- @@ -168,7 +168,10 @@
- if (CategoryData.getInstance().isInCategory(CategoryType.FIRST_CLASS_GROUP, player.getClassId().getId()) && (player.getRace() != Race.ERTHEIA))
- {
- showOnScreenMsg(player, NpcStringId.CLASS_TRANSFER_IS_AVAILABLE_CLICK_THE_CLASS_TRANSFER_ICON_IN_THE_NOTIFICATION_WINDOW_TO_TRANSFER_YOUR_CLASS, ExShowScreenMessage.TOP_CENTER, 10000);
- - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + if (player.canChangeClass(player))
- + {
- + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + }
- }
- final Quest nextQuest = QuestManager.getInstance().getQuest(Q11025_PathOfDestinyProving.class.getSimpleName());
- if (nextQuest != null)
- @@ -430,8 +433,7 @@
- if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
- {
- - final boolean canChangeClass = player.canChangeClass(player);
- - if (canChangeClass)
- + if (player.canChangeClass(player))
- {
- player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- }
- diff --git dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
- index 5d9caef..1f7993d 100644
- --- dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
- +++ dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
- @@ -287,7 +287,10 @@
- if (CategoryData.getInstance().isInCategory(CategoryType.SECOND_CLASS_GROUP, player.getClassId().getId()))
- {
- showOnScreenMsg(player, NpcStringId.CLASS_TRANSFER_IS_AVAILABLE_CLICK_THE_CLASS_TRANSFER_ICON_IN_THE_NOTIFICATION_WINDOW_TO_TRANSFER_YOUR_CLASS, ExShowScreenMessage.TOP_CENTER, 10000);
- - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + if (player.canChangeClass(player))
- + {
- + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + }
- }
- htmltext = event;
- }
- @@ -796,7 +799,10 @@
- if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
- {
- - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + if (player.canChangeClass(player))
- + {
- + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + }
- }
- }
- }
- diff --git dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
- index 4a31dde..ae4bf11 100644
- --- dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
- +++ dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
- @@ -300,7 +300,10 @@
- if (CategoryData.getInstance().isInCategory(CategoryType.THIRD_CLASS_GROUP, player.getClassId().getId()) || (CategoryData.getInstance().isInCategory(CategoryType.SECOND_CLASS_GROUP, player.getClassId().getId()) && (player.getRace() == Race.ERTHEIA)))
- {
- showOnScreenMsg(player, NpcStringId.CLASS_TRANSFER_IS_AVAILABLE_CLICK_THE_CLASS_TRANSFER_ICON_IN_THE_NOTIFICATION_WINDOW_TO_TRANSFER_YOUR_CLASS, ExShowScreenMessage.TOP_CENTER, 10000);
- - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + if (player.canChangeClass(player))
- + {
- + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + }
- }
- htmltext = event;
- }
- @@ -668,7 +671,10 @@
- final QuestState qs = getQuestState(player, false);
- if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
- {
- - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + if (player.canChangeClass(player))
- + {
- + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + }
- }
- }
- }
- diff --git dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
- index 1b4823b..fe729f3 100644
- --- dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
- +++ dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
- @@ -370,7 +370,10 @@
- if (CategoryData.getInstance().isInCategory(CategoryType.FOURTH_CLASS_GROUP, player.getClassId().getId()) || (CategoryData.getInstance().isInCategory(CategoryType.THIRD_CLASS_GROUP, player.getClassId().getId()) && (player.getRace() == Race.ERTHEIA)))
- {
- showOnScreenMsg(player, NpcStringId.CLASS_TRANSFER_IS_AVAILABLE_CLICK_THE_CLASS_TRANSFER_ICON_IN_THE_NOTIFICATION_WINDOW_TO_TRANSFER_YOUR_CLASS, ExShowScreenMessage.TOP_CENTER, 10000);
- - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + if (player.canChangeClass(player))
- + {
- + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + }
- }
- htmltext = event;
- }
- @@ -870,7 +873,10 @@
- final QuestState qs = getQuestState(player, false);
- if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
- {
- - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + if (player.canChangeClass(player))
- + {
- + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + }
- }
- }
- }
- diff --git java/org/l2jmobius/gameserver/model/actor/Player.java java/org/l2jmobius/gameserver/model/actor/Player.java
- index 4b5bcd8..3360b46 100644
- --- java/org/l2jmobius/gameserver/model/actor/Player.java
- +++ java/org/l2jmobius/gameserver/model/actor/Player.java
- @@ -15257,4 +15257,15 @@
- addValue = addValue >= 1 ? addValue : 1;
- return addValue;
- }
- +
- + public boolean canChangeClass(Player player)
- + {
- + final int playerLevel = player.getLevel();
- + boolean changeAllowed = false;
- + if ((player.isInCategory(CategoryType.FIRST_CLASS_GROUP) && (playerLevel >= 18)) || (player.isInCategory(CategoryType.SECOND_CLASS_GROUP) && (playerLevel >= 38)) || (player.isInCategory(CategoryType.THIRD_CLASS_GROUP) && (playerLevel >= 76)) || (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && (playerLevel >= 85)))
- + {
- + changeAllowed = true;
- + }
- + return changeAllowed;
- + }
- }
- diff --git java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
- index 080b56ee..2761fb0 100644
- --- java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
- +++ java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
- @@ -296,9 +296,7 @@
- // getActiveChar().sendPacket(new ExOneDayReceiveRewardList(getActiveChar(), true));
- // trying to run a script to check and prompt for available class changes on level-up
- - final boolean canChangeClass = getActiveChar().canChangeClass(getActiveChar());
- - getActiveChar().sendMessage("_classId = " + getActiveChar().getClassId());
- - if (canChangeClass)
- + if (getActiveChar().canChangeClass(getActiveChar()))
- {
- getActiveChar().sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- }
- diff --git java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
- index 3744878..52669ab 100644
- --- java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
- +++ java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
- @@ -175,10 +175,7 @@
- player.sendSkillList();
- player.sendPacket(new PlaySound("ItemSound.quest_fanfare_2"));
- - if (Config.DISABLE_TUTORIAL && !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) //
- - && ((player.isInCategory(CategoryType.SECOND_CLASS_GROUP) && (playerLevel >= 38)) //
- - || (player.isInCategory(CategoryType.THIRD_CLASS_GROUP) && (playerLevel >= 76)) //
- - || (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && (playerLevel >= 85))))
- + if (Config.DISABLE_TUTORIAL && player.canChangeClass(player))
- {
- player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- }
- diff --git java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
- index 2388725..2a71ae2 100644
- --- java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
- +++ java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
- @@ -86,7 +86,10 @@
- }
- }
- - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + if (player.canChangeClass(player))
- + {
- + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
- + }
- }
- private boolean firstClassCheck(Player player)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement