From c9f503a765906902d161ee91379245b7715f090a Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 26 May 2022 10:51:01 +0000 Subject: [PATCH] Quests should not have GM checks. Thanks to nasseka. --- .../Q10967_CulturedAdventurer.java | 8 +------- .../Q10967_CulturedAdventurer.java | 8 +------- .../Q10291_MoreExperience/Q10291_MoreExperience.java | 8 +------- .../Q10291_MoreExperience/Q10291_MoreExperience.java | 8 +------- .../Q10291_MoreExperience/Q10291_MoreExperience.java | 8 +------- 5 files changed, 5 insertions(+), 35 deletions(-) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java index e95d9d1962..5419e24c3c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java @@ -149,13 +149,7 @@ public class Q10967_CulturedAdventurer extends Quest if ((qs != null) && qs.isCond(1)) { final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; - if (killer.isGM()) - { - qs.setCond(2, true); - qs.unset(KILL_COUNT_VAR); - killer.sendPacket(new ExShowScreenMessage(NpcStringId.MONSTERS_OF_THE_ABANDONED_CAMP_ARE_KILLED_NUSE_THE_TELEPORT_TO_GET_TO_BATHIS_IN_GLUDIO, 2, 5000)); - } - else if (killCount < 300) + if (killCount < 300) { qs.set(KILL_COUNT_VAR, killCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java index 1015cb4cff..88207f42e7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10967_CulturedAdventurer/Q10967_CulturedAdventurer.java @@ -141,13 +141,7 @@ public class Q10967_CulturedAdventurer extends Quest if ((qs != null) && qs.isCond(1)) { final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; - if (killer.isGM()) - { - qs.setCond(2, true); - qs.unset(KILL_COUNT_VAR); - killer.sendPacket(new ExShowScreenMessage(NpcStringId.MONSTERS_OF_THE_ABANDONED_CAMP_ARE_KILLED_NUSE_THE_TELEPORT_TO_GET_TO_BATHIS_IN_GLUDIO, 2, 5000)); - } - else if (killCount < 150) + if (killCount < 150) { qs.set(KILL_COUNT_VAR, killCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java index 18564c0452..f11be4f0df 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java @@ -142,13 +142,7 @@ public class Q10291_MoreExperience extends Quest if ((qs != null) && qs.isCond(1)) { final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; - if (killer.isGM()) - { - qs.setCond(2, true); - qs.unset(KILL_COUNT_VAR); - killer.sendPacket(new ExShowScreenMessage(NpcStringId.MONSTERS_OF_THE_ABANDONED_CAMP_ARE_KILLED_NUSE_THE_TELEPORT_TO_GET_TO_BATHIS_IN_GLUDIO, 2, 5000)); - } - else if (killCount < 50) + if (killCount < 50) { qs.set(KILL_COUNT_VAR, killCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java index f621f0f0d1..23af8e1a6c 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java @@ -142,13 +142,7 @@ public class Q10291_MoreExperience extends Quest if ((qs != null) && qs.isCond(1)) { final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; - if (killer.isGM()) - { - qs.setCond(2, true); - qs.unset(KILL_COUNT_VAR); - killer.sendPacket(new ExShowScreenMessage(NpcStringId.MONSTERS_OF_THE_ABANDONED_CAMP_ARE_KILLED_USE_THE_TELEPORT_TO_GET_TO_BATHIS_IN_GLUDIO, 2, 5000)); - } - else if (killCount < 50) + if (killCount < 50) { qs.set(KILL_COUNT_VAR, killCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java index f621f0f0d1..23af8e1a6c 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/quests/Q10291_MoreExperience/Q10291_MoreExperience.java @@ -142,13 +142,7 @@ public class Q10291_MoreExperience extends Quest if ((qs != null) && qs.isCond(1)) { final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; - if (killer.isGM()) - { - qs.setCond(2, true); - qs.unset(KILL_COUNT_VAR); - killer.sendPacket(new ExShowScreenMessage(NpcStringId.MONSTERS_OF_THE_ABANDONED_CAMP_ARE_KILLED_USE_THE_TELEPORT_TO_GET_TO_BATHIS_IN_GLUDIO, 2, 5000)); - } - else if (killCount < 50) + if (killCount < 50) { qs.set(KILL_COUNT_VAR, killCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);