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

Dropped TimersManager and corrections for previous commits.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-03-31 12:04:59 +00:00
parent 4ed01c5fba
commit b13eb068a1
96 changed files with 1496 additions and 1713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java
View File

@@ -1327,7 +1327,7 @@ public class Npc extends Creature
((Npc) summoner).removeSummonedNpc(getObjectId());
}
// Stop quest timers
// Stop all timers
stopQuestTimers();
// Clear script value
@@ -2082,7 +2082,7 @@ public class Npc extends Creature
{
for (QuestTimer timer : _questTimers)
{
timer.cancel();
timer.cancelTask();
}
_questTimers.clear();
}

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -14411,7 +14411,7 @@ public class PlayerInstance extends Playable
{
for (QuestTimer timer : _questTimers)
{
timer.cancel();
timer.cancelTask();
}
_questTimers.clear();
}

16
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java
View File

@@ -61,11 +61,7 @@ public class QuestTimer
public void cancel()
{
if (_scheduler != null)
{
_scheduler.cancel(false);
_scheduler = null;
}
cancelTask();
if (_npc != null)
{
@@ -76,7 +72,15 @@ public class QuestTimer
{
_player.removeQuestTimer(this);
}
}
public void cancelTask()
{
if ((_scheduler != null) && !_scheduler.isDone() && !_scheduler.isCancelled())
{
_scheduler.cancel(false);
_scheduler = null;
}
_quest.removeQuestTimer(this);
}