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

Precautionary cancel player tasks and quest timers on disconnect.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-03-31 11:01:32 +00:00
parent 5fe7e70c08
commit 39d35b111f
103 changed files with 2875 additions and 1022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -244,6 +244,7 @@ import org.l2jmobius.gameserver.model.punishment.PunishmentAffect;
import org.l2jmobius.gameserver.model.punishment.PunishmentType;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.model.quest.QuestState;
import org.l2jmobius.gameserver.model.quest.QuestTimer;
import org.l2jmobius.gameserver.model.skills.AbnormalType;
import org.l2jmobius.gameserver.model.skills.BuffInfo;
import org.l2jmobius.gameserver.model.skills.CommonSkill;
@@ -509,7 +510,7 @@ public class PlayerInstance extends Playable
private Vehicle _vehicle = null;
private Location _inVehiclePosition;
public ScheduledFuture<?> _taskforfish;
public ScheduledFuture<?> _taskForFish;
private MountType _mountType = MountType.NONE;
private int _mountNpcId;
private int _mountLevel;
@@ -629,6 +630,8 @@ public class PlayerInstance extends Playable
// TODO: This needs to be better integrated and saved/loaded
private final Radar _radar;
private ScheduledFuture<?> _taskWarnUserTakeBreak;
// Party matching
// private int _partymatching = 0;
private int _partyroom = 0;
@@ -811,7 +814,7 @@ public class PlayerInstance extends Playable
private volatile long _lastItemAuctionInfoRequest = 0;
private Future<?> _PvPRegTask;
private Future<?> _pvpRegTask;
private long _pvpFlagLasts;
@@ -879,30 +882,27 @@ public class PlayerInstance extends Playable
public void startPvPFlag()
{
updatePvPFlag(1);
if (_PvPRegTask == null)
if (_pvpRegTask == null)
{
_PvPRegTask = ThreadPool.scheduleAtFixedRate(new PvPFlagTask(this), 1000, 1000);
_pvpRegTask = ThreadPool.scheduleAtFixedRate(new PvPFlagTask(this), 1000, 1000);
}
}
public void stopPvpRegTask()
{
if (_PvPRegTask == null)
if (_pvpRegTask == null)
{
return;
}
_PvPRegTask.cancel(true);
_PvPRegTask = null;
_pvpRegTask.cancel(true);
_pvpRegTask = null;
}
public void stopPvPFlag()
{
stopPvpRegTask();
updatePvPFlag(0);
_PvPRegTask = null;
_pvpRegTask = null;
}
// Character UI
@@ -925,6 +925,8 @@ public class PlayerInstance extends Playable
private boolean _hasCharmOfCourage = false;
private final List<QuestTimer> _questTimers = new ArrayList<>();
// Selling buffs system
private boolean _isSellingBuffs = false;
private List<SellBuffHolder> _sellingBuffs = null;
@@ -7003,9 +7005,6 @@ public class PlayerInstance extends Playable
return player;
}
/**
* @return
*/
public Forum getMail()
{
if (_forumMail == null)
@@ -7021,17 +7020,11 @@ public class PlayerInstance extends Playable
return _forumMail;
}
/**
* @param forum
*/
public void setMail(Forum forum)
{
_forumMail = forum;
}
/**
* @return
*/
public Forum getMemo()
{
if (_forumMemo == null)
@@ -7047,9 +7040,6 @@ public class PlayerInstance extends Playable
return _forumMemo;
}
/**
* @param forum
*/
public void setMemo(Forum forum)
{
_forumMemo = forum;
@@ -9344,8 +9334,6 @@ public class PlayerInstance extends Playable
_activeSoulShots.clear();
}
private ScheduledFuture<?> _taskWarnUserTakeBreak;
public EnumIntBitmask<ClanPrivilege> getClanPrivileges()
{
return _clanPrivileges;
@@ -11523,17 +11511,17 @@ public class PlayerInstance extends Playable
public void stopLookingForFishTask()
{
if (_taskforfish == null)
if (_taskForFish == null)
{
return;
}
_taskforfish.cancel(false);
_taskforfish = null;
_taskForFish.cancel(false);
_taskForFish = null;
}
public void startLookingForFishTask()
{
if (!isDead() && (_taskforfish == null))
if (!isDead() && (_taskForFish == null))
{
int checkDelay = 0;
boolean isNoob = false;
@@ -11556,7 +11544,7 @@ public class PlayerInstance extends Playable
checkDelay = _fish.getGutsCheckTime() * 66;
}
}
_taskforfish = ThreadPool.scheduleAtFixedRate(new LookingForFishTask(this, _fish.getStartCombatTime(), _fish.getFishGuts(), _fish.getFishGroup(), isNoob, isUpperGrade), 10000, checkDelay);
_taskForFish = ThreadPool.scheduleAtFixedRate(new LookingForFishTask(this, _fish.getStartCombatTime(), _fish.getFishGuts(), _fish.getFishGroup(), isNoob, isUpperGrade), 10000, checkDelay);
}
}
@@ -14435,4 +14423,107 @@ public class PlayerInstance extends Playable
{
removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
}
/**
* Precautionary method to end all tasks upon disconnection.
* @TODO: Rework stopAllTimers() method.
*/
public void stopAllTasks()
{
if ((_mountFeedTask != null) && !_mountFeedTask.isDone() && !_mountFeedTask.isCancelled())
{
_mountFeedTask.cancel(false);
_mountFeedTask = null;
}
if ((_dismountTask != null) && !_dismountTask.isDone() && !_dismountTask.isCancelled())
{
_dismountTask.cancel(false);
_dismountTask = null;
}
if ((_fameTask != null) && !_fameTask.isDone() && !_fameTask.isCancelled())
{
_fameTask.cancel(false);
_fameTask = null;
}
if ((_vitalityTask != null) && !_vitalityTask.isDone() && !_vitalityTask.isCancelled())
{
_vitalityTask.cancel(false);
_vitalityTask = null;
}
if ((_teleportWatchdog != null) && !_teleportWatchdog.isDone() && !_teleportWatchdog.isCancelled())
{
_teleportWatchdog.cancel(false);
_teleportWatchdog = null;
}
if ((_taskForFish != null) && !_taskForFish.isDone() && !_taskForFish.isCancelled())
{
_taskForFish.cancel(false);
_taskForFish = null;
}
if ((_chargeTask != null) && !_chargeTask.isDone() && !_chargeTask.isCancelled())
{
_chargeTask.cancel(false);
_chargeTask = null;
}
if ((_soulTask != null) && !_soulTask.isDone() && !_soulTask.isCancelled())
{
_soulTask.cancel(false);
_soulTask = null;
}
if ((_taskRentPet != null) && !_taskRentPet.isDone() && !_taskRentPet.isCancelled())
{
_taskRentPet.cancel(false);
_taskRentPet = null;
}
if ((_taskWater != null) && !_taskWater.isDone() && !_taskWater.isCancelled())
{
_taskWater.cancel(false);
_taskWater = null;
}
if ((_fallingDamageTask != null) && !_fallingDamageTask.isDone() && !_fallingDamageTask.isCancelled())
{
_fallingDamageTask.cancel(false);
_fallingDamageTask = null;
}
if ((_pvpRegTask != null) && !_pvpRegTask.isDone() && !_pvpRegTask.isCancelled())
{
_pvpRegTask.cancel(false);
_pvpRegTask = null;
}
if ((_autoSaveTask != null) && !_autoSaveTask.isDone() && !_autoSaveTask.isCancelled())
{
_autoSaveTask.cancel(false);
_autoSaveTask = null;
}
if ((_taskWarnUserTakeBreak != null) && !_taskWarnUserTakeBreak.isDone() && !_taskWarnUserTakeBreak.isCancelled())
{
_taskWarnUserTakeBreak.cancel(false);
_taskWarnUserTakeBreak = null;
}
synchronized (_questTimers)
{
for (QuestTimer timer : _questTimers)
{
timer.cancel();
}
_questTimers.clear();
}
}
public void addQuestTimer(QuestTimer questTimer)
{
synchronized (_questTimers)
{
_questTimers.add(questTimer);
}
}
public void removeQuestTimer(QuestTimer questTimer)
{
synchronized (_questTimers)
{
_questTimers.remove(questTimer);
}
}
}

4
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
View File

@@ -448,7 +448,7 @@ public abstract class ItemContainer
item.updateDatabase();
}
refreshWeight();
item.deleteMe();
item.stopAllTasks();
}
return item;
}
@@ -555,7 +555,7 @@ public abstract class ItemContainer
if (item != null)
{
item.updateDatabase(true);
item.deleteMe();
item.stopAllTasks();
World.getInstance().removeObject(item);
}
}

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java
View File

@@ -164,7 +164,7 @@ public class Mail extends ItemContainer
_items.forEach(item ->
{
item.updateDatabase(true);
item.deleteMe();
item.stopAllTasks();
World.getInstance().removeObject(item);
});
_items.clear();

14
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
View File

@@ -155,7 +155,7 @@ public class ItemInstance extends WorldObject
private Elementals[] _elementals = null;
private ScheduledFuture<?> itemLootShedule = null;
private ScheduledFuture<?> _itemLootShedule = null;
private ScheduledFuture<?> _lifeTimeTask;
private final DropProtection _dropProtection = new DropProtection();
@@ -1732,21 +1732,21 @@ public class ItemInstance extends WorldObject
public void resetOwnerTimer()
{
if (itemLootShedule != null)
if (_itemLootShedule != null)
{
itemLootShedule.cancel(true);
itemLootShedule = null;
_itemLootShedule.cancel(true);
_itemLootShedule = null;
}
}
public void setItemLootShedule(ScheduledFuture<?> sf)
{
itemLootShedule = sf;
_itemLootShedule = sf;
}
public ScheduledFuture<?> getItemLootShedule()
{
return itemLootShedule;
return _itemLootShedule;
}
public void setProtected(boolean isProtected)
@@ -2191,7 +2191,7 @@ public class ItemInstance extends WorldObject
{
}
public void deleteMe()
public void stopAllTasks()
{
if ((_lifeTimeTask != null) && !_lifeTimeTask.isDone())
{

10
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/QuestTimer.java
View File

@@ -47,6 +47,11 @@ public class QuestTimer
{
_scheduler = ThreadPool.schedule(new ScheduleTimerTask(), time); // Prepare auto end task
}
if (player != null)
{
player.addQuestTimer(this);
}
}
public void cancel()
@@ -57,6 +62,11 @@ public class QuestTimer
_scheduler = null;
}
if (_player != null)
{
_player.removeQuestTimer(this);
}
_quest.removeQuestTimer(this);
}

6
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/Disconnection.java
View File

@@ -91,6 +91,12 @@ public class Disconnection
_client = getClient(client, player);
_player = getActiveChar(client, player);
// Stop player tasks.
if (_player != null)
{
_player.stopAllTasks();
}
// Anti Feed
AntiFeedManager.getInstance().onDisconnect(_client);