lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unnecessary object id from fake player flag tasks.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-03-22 08:33:48 +00:00
parent c9f8da5371
commit 747e6c5d19
57 changed files with 322 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
Vendored
+2 -2
View File
@@ -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); return super.onAdvEvent(event, npc, player);
} }
@@ -104,7 +104,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
@Override @Override
public String onSpawn(Npc npc) public String onSpawn(Npc npc)
{ {
startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); startQuestTimer("AUTOBUFF", 1000, npc, null);
return super.onSpawn(npc); return super.onSpawn(npc);
} }
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -1
View File
@@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status broadcastInfo(); // update flag status
QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null);
} }
} }
} }
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+1 -1
View File
@@ -677,7 +677,7 @@ public class SkillCaster implements Runnable
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
Vendored
+2 -2
View File
@@ -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); return super.onAdvEvent(event, npc, player);
} }
@@ -104,7 +104,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
@Override @Override
public String onSpawn(Npc npc) public String onSpawn(Npc npc)
{ {
startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); startQuestTimer("AUTOBUFF", 1000, npc, null);
return super.onSpawn(npc); return super.onSpawn(npc);
} }
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -1
View File
@@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status broadcastInfo(); // update flag status
QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null);
} }
} }
} }
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+1 -1
View File
@@ -683,7 +683,7 @@ public class SkillCaster implements Runnable
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
Vendored
+2 -2
View File
@@ -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); return super.onAdvEvent(event, npc, player);
} }
@@ -104,7 +104,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
@Override @Override
public String onSpawn(Npc npc) public String onSpawn(Npc npc)
{ {
startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); startQuestTimer("AUTOBUFF", 1000, npc, null);
return super.onSpawn(npc); return super.onSpawn(npc);
} }
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -1
View File
@@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status broadcastInfo(); // update flag status
QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null);
} }
} }
} }
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+1 -1
View File
@@ -683,7 +683,7 @@ public class SkillCaster implements Runnable
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
Vendored
+2 -2
View File
@@ -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); return super.onAdvEvent(event, npc, player);
} }
@@ -104,7 +104,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
@Override @Override
public String onSpawn(Npc npc) public String onSpawn(Npc npc)
{ {
startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); startQuestTimer("AUTOBUFF", 1000, npc, null);
return super.onSpawn(npc); return super.onSpawn(npc);
} }
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -1
View File
@@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status broadcastInfo(); // update flag status
QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null);
} }
} }
} }
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+1 -1
View File
@@ -683,7 +683,7 @@ public class SkillCaster implements Runnable
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
Vendored
+2 -2
View File
@@ -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); return super.onAdvEvent(event, npc, player);
} }
@@ -102,7 +102,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
@Override @Override
public String onSpawn(Npc npc) public String onSpawn(Npc npc)
{ {
startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); startQuestTimer("AUTOBUFF", 1000, npc, null);
return super.onSpawn(npc); return super.onSpawn(npc);
} }
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -1
View File
@@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status broadcastInfo(); // update flag status
QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null);
} }
} }
} }
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+1 -1
View File
@@ -683,7 +683,7 @@ public class SkillCaster implements Runnable
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
Vendored
+2 -2
View File
@@ -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); return super.onAdvEvent(event, npc, player);
} }
@@ -102,7 +102,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
@Override @Override
public String onSpawn(Npc npc) public String onSpawn(Npc npc)
{ {
startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); startQuestTimer("AUTOBUFF", 1000, npc, null);
return super.onSpawn(npc); return super.onSpawn(npc);
} }
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -1
View File
@@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status broadcastInfo(); // update flag status
QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null);
} }
} }
} }
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+1 -1
View File
@@ -683,7 +683,7 @@ public class SkillCaster implements Runnable
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
Vendored
+2 -2
View File
@@ -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); return super.onAdvEvent(event, npc, player);
} }
@@ -102,7 +102,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
@Override @Override
public String onSpawn(Npc npc) public String onSpawn(Npc npc)
{ {
startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); startQuestTimer("AUTOBUFF", 1000, npc, null);
return super.onSpawn(npc); return super.onSpawn(npc);
} }
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -1
View File
@@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status broadcastInfo(); // update flag status
QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null);
} }
} }
} }
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+1 -1
View File
@@ -683,7 +683,7 @@ public class SkillCaster implements Runnable
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/FakePlayers/RecieveAdventurerBuffs.java
Vendored
+2 -2
View File
@@ -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); return super.onAdvEvent(event, npc, player);
} }
@@ -102,7 +102,7 @@ public class RecieveAdventurerBuffs extends AbstractNpcAI
@Override @Override
public String onSpawn(Npc npc) public String onSpawn(Npc npc)
{ {
startQuestTimer("AUTOBUFF" + npc.getObjectId(), 1000, npc, null); startQuestTimer("AUTOBUFF", 1000, npc, null);
return super.onSpawn(npc); return super.onSpawn(npc);
} }
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -1
View File
@@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status broadcastInfo(); // update flag status
QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null);
} }
} }
} }
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+1 -1
View File
@@ -683,7 +683,7 @@ public class SkillCaster implements Runnable
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
+2 -2
View File
@@ -1053,7 +1053,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status 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.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
+2 -2
View File
@@ -1054,7 +1054,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status 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.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -1
View File
@@ -1171,7 +1171,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status broadcastInfo(); // update flag status
QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null);
} }
} }
} }
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+1 -1
View File
@@ -683,7 +683,7 @@ public class SkillCaster implements Runnable
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -1
View File
@@ -1171,7 +1171,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status broadcastInfo(); // update flag status
QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null);
} }
} }
} }
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+1 -1
View File
@@ -683,7 +683,7 @@ public class SkillCaster implements Runnable
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -1
View File
@@ -1171,7 +1171,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status broadcastInfo(); // update flag status
QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null);
} }
} }
} }
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+1 -1
View File
@@ -683,7 +683,7 @@ public class SkillCaster implements Runnable
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -1
View File
@@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status broadcastInfo(); // update flag status
QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null);
} }
} }
} }
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+1 -1
View File
@@ -683,7 +683,7 @@ public class SkillCaster implements Runnable
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -1
View File
@@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status broadcastInfo(); // update flag status
QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null);
} }
} }
} }
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+1 -1
View File
@@ -683,7 +683,7 @@ public class SkillCaster implements Runnable
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -1
View File
@@ -1172,7 +1172,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status broadcastInfo(); // update flag status
QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null);
} }
} }
} }
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+1 -1
View File
@@ -683,7 +683,7 @@ public class SkillCaster implements Runnable
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/FakePlayers/PvpFlaggingStopTask.java
Vendored
+16 -9
View File
@@ -36,33 +36,40 @@ public class PvpFlaggingStopTask extends AbstractNpcAI
@Override @Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player) public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{ {
if ((npc == null) || npc.isDead()) if (npc == null)
{ {
return 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(); final WorldObject target = npc.getTarget();
if ((target != null) && (target.isPlayable() || target.isFakePlayer())) if ((target != null) && (target.isPlayable() || target.isFakePlayer()))
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
cancelQuestTimer("FINISH_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("FINISH_FLAG", npc, null);
cancelQuestTimer("REMOVE_FLAG" + npc.getObjectId(), npc, null); cancelQuestTimer("REMOVE_FLAG", npc, null);
startQuestTimer("FINISH_FLAG" + npc.getObjectId(), Config.PVP_NORMAL_TIME - 20000, npc, null); startQuestTimer("FINISH_FLAG", Config.PVP_NORMAL_TIME - 20000, npc, null);
startQuestTimer("FLAG_CHECK" + npc.getObjectId(), 5000, npc, null); startQuestTimer("FLAG_CHECK", 5000, npc, null);
} }
} }
else if (event.startsWith("FINISH_FLAG")) else if (event.equals("FINISH_FLAG"))
{ {
if (npc.isScriptValue(1)) if (npc.isScriptValue(1))
{ {
npc.setScriptValue(2); // blink status npc.setScriptValue(2); // blink status
npc.broadcastInfo(); // update flag 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)) if (npc.isScriptValue(2))
{ {
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+1 -1
View File
@@ -1171,7 +1171,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
broadcastInfo(); // update flag status broadcastInfo(); // update flag status
QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK" + npc.getObjectId(), npc, null); QuestManager.getInstance().getQuest("PvpFlaggingStopTask").notifyEvent("FLAG_CHECK", npc, null);
} }
} }
} }
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+1 -1
View File
@@ -683,7 +683,7 @@ public class SkillCaster implements Runnable
{ {
npc.setScriptValue(1); // in combat npc.setScriptValue(1); // in combat
npc.broadcastInfo(); // update flag status 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);
} }
} }
} }