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

Decoy class rework and cleanup.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-09-21 00:48:06 +00:00
parent e6816acab1
commit ee04013579
27 changed files with 819 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/instance/Decoy.java
View File

@@ -45,6 +45,11 @@ public class Decoy extends Creature
private Future<?> _hateSpam;
public Decoy(NpcTemplate template, Player owner, int totalLifeTime)
{
this(template, owner, totalLifeTime, true);
}
public Decoy(NpcTemplate template, Player owner, int totalLifeTime, boolean aggressive)
{
super(template);
setInstanceType(InstanceType.Decoy);
@@ -53,10 +58,13 @@ public class Decoy extends Creature
setInvul(false);
_totalLifeTime = totalLifeTime;
_timeRemaining = _totalLifeTime;
final int hateSpamSkillId = 5272;
final int skilllevel = Math.min(getTemplate().getDisplayId() - 13070, SkillData.getInstance().getMaxLevel(hateSpamSkillId));
_decoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000);
_hateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(hateSpamSkillId, skilllevel)), 2000, 5000);
_decoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(this), 1000, 1000);
if (aggressive)
{
final int hateSpamSkillId = 5272;
final int skilllevel = Math.min(getTemplate().getDisplayId() - 13070, SkillData.getInstance().getMaxLevel(hateSpamSkillId));
_hateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(hateSpamSkillId, skilllevel)), 2000, 5000);
}
}
@Override
@@ -78,14 +86,11 @@ public class Decoy extends Creature
static class DecoyLifetime implements Runnable
{
private final Player _player;
private final Decoy _decoy;
private final Decoy _Decoy;
DecoyLifetime(Player player, Decoy decoy)
DecoyLifetime(Decoy decoy)
{
_player = player;
_Decoy = decoy;
_decoy = decoy;
}
@Override
@@ -93,11 +98,11 @@ public class Decoy extends Creature
{
try
{
_Decoy.decTimeRemaining(1000);
final double newTimeRemaining = _Decoy.getTimeRemaining();
_decoy.decTimeRemaining(1000);
final double newTimeRemaining = _decoy.getTimeRemaining();
if (newTimeRemaining < 0)
{
_Decoy.unSummon(_player);
_decoy.unSummon();
}
}
catch (Exception e)
@@ -133,7 +138,7 @@ public class Decoy extends Creature
}
}
public void unSummon(Player owner)
public void unSummon()
{
if (_decoyLifeTask != null)
{