From 747e6c5d1937ef3cb2ce2121f4cdd752aee48b51 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 22 Mar 2020 08:33:48 +0000 Subject: [PATCH] Removed unnecessary object id from fake player flag tasks. --- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../FakePlayers/RecieveAdventurerBuffs.java | 4 +-- .../gameserver/model/actor/Creature.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 2 +- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../FakePlayers/RecieveAdventurerBuffs.java | 4 +-- .../gameserver/model/actor/Creature.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 2 +- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../FakePlayers/RecieveAdventurerBuffs.java | 4 +-- .../gameserver/model/actor/Creature.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 2 +- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../FakePlayers/RecieveAdventurerBuffs.java | 4 +-- .../gameserver/model/actor/Creature.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 2 +- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../FakePlayers/RecieveAdventurerBuffs.java | 4 +-- .../gameserver/model/actor/Creature.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 2 +- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../FakePlayers/RecieveAdventurerBuffs.java | 4 +-- .../gameserver/model/actor/Creature.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 2 +- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../FakePlayers/RecieveAdventurerBuffs.java | 4 +-- .../gameserver/model/actor/Creature.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 2 +- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../FakePlayers/RecieveAdventurerBuffs.java | 4 +-- .../gameserver/model/actor/Creature.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 2 +- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../gameserver/model/actor/Creature.java | 4 +-- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../gameserver/model/actor/Creature.java | 4 +-- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../gameserver/model/actor/Creature.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 2 +- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../gameserver/model/actor/Creature.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 2 +- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../gameserver/model/actor/Creature.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 2 +- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../gameserver/model/actor/Creature.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 2 +- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../gameserver/model/actor/Creature.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 2 +- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../gameserver/model/actor/Creature.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 2 +- .../FakePlayers/PvpFlaggingStopTask.java | 25 ++++++++++++------- .../gameserver/model/actor/Creature.java | 2 +- .../gameserver/model/skills/SkillCaster.java | 2 +- 57 files changed, 322 insertions(+), 203 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java index 9344fbb9fb..1d0ca7eb9c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java @@ -96,7 +96,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI } } } - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 30000, npc, null); + startQuestTimer("AUTOBUFF", 30000, npc, null); } return super.onAdvEvent(event, npc, player); } @@ -104,7 +104,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI @Override public String onSpawn(Npc npc) { - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); + startQuestTimer("AUTOBUFF", 1000, npc, null); return super.onSpawn(npc); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java index 06bc34124f..fdb3d6a089 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 72c63b4c74..d5e67aaaf8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -677,7 +677,7 @@ public class SkillCaster implements Runnable { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java index 9344fbb9fb..1d0ca7eb9c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java @@ -96,7 +96,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI } } } - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 30000, npc, null); + startQuestTimer("AUTOBUFF", 30000, npc, null); } return super.onAdvEvent(event, npc, player); } @@ -104,7 +104,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI @Override public String onSpawn(Npc npc) { - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); + startQuestTimer("AUTOBUFF", 1000, npc, null); return super.onSpawn(npc); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java index 06bc34124f..fdb3d6a089 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 6d6cd04ce0..a4262b6c84 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -683,7 +683,7 @@ public class SkillCaster implements Runnable { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java index 9344fbb9fb..1d0ca7eb9c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java @@ -96,7 +96,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI } } } - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 30000, npc, null); + startQuestTimer("AUTOBUFF", 30000, npc, null); } return super.onAdvEvent(event, npc, player); } @@ -104,7 +104,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI @Override public String onSpawn(Npc npc) { - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); + startQuestTimer("AUTOBUFF", 1000, npc, null); return super.onSpawn(npc); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java index f653f1f583..8b32479ab1 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 6d6cd04ce0..a4262b6c84 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -683,7 +683,7 @@ public class SkillCaster implements Runnable { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java index 9344fbb9fb..1d0ca7eb9c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java @@ -96,7 +96,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI } } } - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 30000, npc, null); + startQuestTimer("AUTOBUFF", 30000, npc, null); } return super.onAdvEvent(event, npc, player); } @@ -104,7 +104,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI @Override public String onSpawn(Npc npc) { - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); + startQuestTimer("AUTOBUFF", 1000, npc, null); return super.onSpawn(npc); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java index f653f1f583..8b32479ab1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 6d6cd04ce0..a4262b6c84 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -683,7 +683,7 @@ public class SkillCaster implements Runnable { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java index 8b19abc3ae..db2754ebbc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java @@ -94,7 +94,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI } } } - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 30000, npc, null); + startQuestTimer("AUTOBUFF", 30000, npc, null); } return super.onAdvEvent(event, npc, player); } @@ -102,7 +102,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI @Override public String onSpawn(Npc npc) { - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); + startQuestTimer("AUTOBUFF", 1000, npc, null); return super.onSpawn(npc); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java index ca28666cfb..a0bb8dfde2 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index f4eb3a055f..0d4f9a86ae 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -683,7 +683,7 @@ public class SkillCaster implements Runnable { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java index 8b19abc3ae..db2754ebbc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java @@ -94,7 +94,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI } } } - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 30000, npc, null); + startQuestTimer("AUTOBUFF", 30000, npc, null); } return super.onAdvEvent(event, npc, player); } @@ -102,7 +102,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI @Override public String onSpawn(Npc npc) { - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); + startQuestTimer("AUTOBUFF", 1000, npc, null); return super.onSpawn(npc); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java index ca28666cfb..a0bb8dfde2 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index f4eb3a055f..0d4f9a86ae 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -683,7 +683,7 @@ public class SkillCaster implements Runnable { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java index 8b19abc3ae..db2754ebbc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java @@ -94,7 +94,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI } } } - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 30000, npc, null); + startQuestTimer("AUTOBUFF", 30000, npc, null); } return super.onAdvEvent(event, npc, player); } @@ -102,7 +102,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI @Override public String onSpawn(Npc npc) { - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); + startQuestTimer("AUTOBUFF", 1000, npc, null); return super.onSpawn(npc); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java index ca28666cfb..a0bb8dfde2 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index f4eb3a055f..0d4f9a86ae 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -683,7 +683,7 @@ public class SkillCaster implements Runnable { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java index 8b19abc3ae..db2754ebbc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java @@ -94,7 +94,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI } } } - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 30000, npc, null); + startQuestTimer("AUTOBUFF", 30000, npc, null); } return super.onAdvEvent(event, npc, player); } @@ -102,7 +102,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI @Override public String onSpawn(Npc npc) { - startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); + startQuestTimer("AUTOBUFF", 1000, npc, null); return super.onSpawn(npc); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java index 188bbc6d0f..b33ba6208b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 2fd02e1936..557bb2aaae 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -683,7 +683,7 @@ public class SkillCaster implements Runnable { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java index 0714931340..44845127f1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1053,7 +1053,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } @@ -5760,7 +5760,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java index 4e81bc9aee..85a4498524 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1054,7 +1054,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } @@ -5762,7 +5762,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java index 7a602aa860..f8a4540137 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1171,7 +1171,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index f4662c2b87..2cecb3dc9f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -683,7 +683,7 @@ public class SkillCaster implements Runnable { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java index 7a602aa860..f8a4540137 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1171,7 +1171,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index f4662c2b87..2cecb3dc9f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -683,7 +683,7 @@ public class SkillCaster implements Runnable { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java index bee7179185..7dd9c00057 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1171,7 +1171,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index f4662c2b87..2cecb3dc9f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -683,7 +683,7 @@ public class SkillCaster implements Runnable { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java index 29fb386a1b..21395c1bd3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index f4662c2b87..2cecb3dc9f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -683,7 +683,7 @@ public class SkillCaster implements Runnable { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java index 29fb386a1b..21395c1bd3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index f4662c2b87..2cecb3dc9f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -683,7 +683,7 @@ public class SkillCaster implements Runnable { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java index 1ea7f94f2d..51ca2e3981 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index 94273f6d7c..12358cbb83 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -683,7 +683,7 @@ public class SkillCaster implements Runnable { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java index 691b9b01ff..94d9e05274 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java @@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI @Override public String onAdvEvent(String event, Npc npc, PlayerInstance player) { - if ((npc == null) || npc.isDead()) + if (npc == null) { return null; } + if (npc.isDead()) + { + cancelQuestTimer("FLAG_CHECK", npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + return null; + } - if (event.startsWith("FLAG_CHECK")) + if (event.equals("FLAG_CHECK")) { final WorldObject target = npc.getTarget(); if ((target != null) && (target.isPlayable() || target.isFakePlayer())) { npc.setScriptValue(1); // in combat - cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); - cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); - startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); - startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); + cancelQuestTimer("FINISH_FLAG", npc, null); + cancelQuestTimer("REMOVE_FLAG", npc, null); + startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null); + startQuestTimer("FLAG_CHECK", 5000, npc, null); } } - else if (event.startsWith("FINISH_FLAG")) + else if (event.equals("FINISH_FLAG")) { if (npc.isScriptValue(1)) { npc.setScriptValue(2); // blink status npc.broadcastInfo(); // update flag status - startQuestTimer("REMOVE_FLAG" + npc.getObjectId(), 20000, npc, null); + startQuestTimer("REMOVE_FLAG", 20000, npc, null); } } - else if (event.startsWith("REMOVE_FLAG")) + else if (event.equals("REMOVE_FLAG")) { if (npc.isScriptValue(2)) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 7a602aa860..f8a4540137 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -1171,7 +1171,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { npc.setScriptValue(1); // in combat broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java index f4662c2b87..2cecb3dc9f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -683,7 +683,7 @@ public class SkillCaster implements Runnable { npc.setScriptValue(1); // in combat npc.broadcastInfo(); // update flag status - QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); + QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null); } } }