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

Check for L2DecoyInstance max hate skill level.

Browse Source
This commit is contained in:
MobiusDev
2019-01-20 23:43:30 +00:00
parent 6a0e2121db
commit dbfae1f113
10 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java
View File

@ -52,9 +52,10 @@ public class L2DecoyInstance extends L2Character
setIsInvul(false); setIsInvul(false);
_totalLifeTime = totalLifeTime; _totalLifeTime = totalLifeTime;
_timeRemaining = _totalLifeTime; _timeRemaining = _totalLifeTime;
final int skilllevel = getTemplate().getDisplayId() - 13070; 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); _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000);
_HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(hateSpamSkillId, skilllevel)), 2000, 5000);
} }
@Override @Override

5
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java
View File

@ -52,9 +52,10 @@ public class L2DecoyInstance extends L2Character
setIsInvul(false); setIsInvul(false);
_totalLifeTime = totalLifeTime; _totalLifeTime = totalLifeTime;
_timeRemaining = _totalLifeTime; _timeRemaining = _totalLifeTime;
final int skilllevel = getTemplate().getDisplayId() - 13070; 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); _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000);
_HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(hateSpamSkillId, skilllevel)), 2000, 5000);
} }
@Override @Override

5
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java
View File

@ -52,9 +52,10 @@ public class L2DecoyInstance extends L2Character
setIsInvul(false); setIsInvul(false);
_totalLifeTime = totalLifeTime; _totalLifeTime = totalLifeTime;
_timeRemaining = _totalLifeTime; _timeRemaining = _totalLifeTime;
final int skilllevel = getTemplate().getDisplayId() - 13070; 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); _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000);
_HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(hateSpamSkillId, skilllevel)), 2000, 5000);
} }
@Override @Override

5
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java
View File

@ -52,9 +52,10 @@ public class L2DecoyInstance extends L2Character
setIsInvul(false); setIsInvul(false);
_totalLifeTime = totalLifeTime; _totalLifeTime = totalLifeTime;
_timeRemaining = _totalLifeTime; _timeRemaining = _totalLifeTime;
final int skilllevel = getTemplate().getDisplayId() - 13070; 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); _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000);
_HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(hateSpamSkillId, skilllevel)), 2000, 5000);
} }
@Override @Override

5
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java
View File

@ -52,9 +52,10 @@ public class L2DecoyInstance extends L2Character
setIsInvul(false); setIsInvul(false);
_totalLifeTime = totalLifeTime; _totalLifeTime = totalLifeTime;
_timeRemaining = _totalLifeTime; _timeRemaining = _totalLifeTime;
final int skilllevel = getTemplate().getDisplayId() - 13070; 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); _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000);
_HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(hateSpamSkillId, skilllevel)), 2000, 5000);
} }
@Override @Override

5
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java
View File

@ -52,9 +52,10 @@ public class L2DecoyInstance extends L2Character
setIsInvul(false); setIsInvul(false);
_totalLifeTime = totalLifeTime; _totalLifeTime = totalLifeTime;
_timeRemaining = _totalLifeTime; _timeRemaining = _totalLifeTime;
final int skilllevel = getTemplate().getDisplayId() - 13070; 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); _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000);
_HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(hateSpamSkillId, skilllevel)), 2000, 5000);
} }
@Override @Override

5
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java
View File

@ -52,9 +52,10 @@ public class L2DecoyInstance extends L2Character
setIsInvul(false); setIsInvul(false);
_totalLifeTime = totalLifeTime; _totalLifeTime = totalLifeTime;
_timeRemaining = _totalLifeTime; _timeRemaining = _totalLifeTime;
final int skilllevel = getTemplate().getDisplayId() - 13070; 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); _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000);
_HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(hateSpamSkillId, skilllevel)), 2000, 5000);
} }
@Override @Override

5
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java
View File

@ -52,9 +52,10 @@ public class L2DecoyInstance extends L2Character
setIsInvul(false); setIsInvul(false);
_totalLifeTime = totalLifeTime; _totalLifeTime = totalLifeTime;
_timeRemaining = _totalLifeTime; _timeRemaining = _totalLifeTime;
final int skilllevel = getTemplate().getDisplayId() - 13070; 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); _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000);
_HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(hateSpamSkillId, skilllevel)), 2000, 5000);
} }
@Override @Override

5
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java
View File

@ -52,9 +52,10 @@ public class L2DecoyInstance extends L2Character
setIsInvul(false); setIsInvul(false);
_totalLifeTime = totalLifeTime; _totalLifeTime = totalLifeTime;
_timeRemaining = _totalLifeTime; _timeRemaining = _totalLifeTime;
final int skilllevel = getTemplate().getDisplayId() - 13070; 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); _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000);
_HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(hateSpamSkillId, skilllevel)), 2000, 5000);
} }
@Override @Override

5
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/L2DecoyInstance.java
View File

@ -52,9 +52,10 @@ public class L2DecoyInstance extends L2Character
setIsInvul(false); setIsInvul(false);
_totalLifeTime = totalLifeTime; _totalLifeTime = totalLifeTime;
_timeRemaining = _totalLifeTime; _timeRemaining = _totalLifeTime;
final int skilllevel = getTemplate().getDisplayId() - 13070; 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); _DecoyLifeTask = ThreadPool.scheduleAtFixedRate(new DecoyLifetime(_owner, this), 1000, 1000);
_HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skilllevel)), 2000, 5000); _HateSpam = ThreadPool.scheduleAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(hateSpamSkillId, skilllevel)), 2000, 5000);
} }
@Override @Override