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

Fixed issue with ConsumeBody effect.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-05-09 22:11:21 +00:00
parent d60ed9a3be
commit af7fa05ceb
8 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java vendored
View File

@@ -16,11 +16,15 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skill.BuffInfo;
import org.l2jmobius.gameserver.model.skill.EffectScope;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.taskmanager.DecayTaskManager;
/**
* Consume Body effect implementation.
@@ -47,6 +51,14 @@ public class ConsumeBody extends AbstractEffect
return;
}
((Npc) info.getEffected()).endDecayTask();
if (info.getSkill().hasEffects(EffectScope.START))
{
DecayTaskManager.getInstance().cancel(info.getEffected());
ThreadPool.schedule(() -> info.getEffected().onDecay(), Formulas.calcAtkSpd(info.getEffector(), info.getSkill(), info.getSkill().getHitTime() + info.getSkill().getCoolTime()));
}
else
{
((Npc) info.getEffected()).endDecayTask();
}
}
}

2
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -65,7 +65,7 @@ public class Summon extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
if (!info.getEffected().isPlayer() || info.getEffected().hasSummon())
if (!info.getEffector().isPlayer() || info.getEffector().hasSummon())
{
return;
}

10
L2J_Mobius_CT_0_Interlude/dist/game/data/stats/skills/01100-01199.xml vendored
View File

@@ -430,6 +430,9 @@
<cond>
<player canSummon="true" />
</cond>
<startEffects>
<effect name="ConsumeBody" />
</startEffects>
<for>
<effect name="Summon">
<param npcId="#npcIds" />
@@ -437,7 +440,6 @@
<param lifeTime="3600" />
<param expMultiplier="0.85" />
</effect>
<effect name="ConsumeBody" />
</for>
<enchant1for>
<effect name="Summon">
@@ -446,7 +448,6 @@
<param lifeTime="3600" />
<param expMultiplier="#summonExpMultiplierEnch" />
</effect>
<effect name="ConsumeBody" />
</enchant1for>
</skill>
<skill id="1139" levels="2" name="Servitor Magic Shield" enchantGroup1="1" enchantGroup2="1">
@@ -799,13 +800,15 @@
<cond>
<player canSummon="true" />
</cond>
<startEffects>
<effect name="ConsumeBody" />
</startEffects>
<for>
<effect name="Summon">
<param npcId="#npcIds" />
<param lifeTime="3600" />
<param expMultiplier="0.1" />
</effect>
<effect name="ConsumeBody" />
</for>
<enchant1for>
<effect name="Summon">
@@ -813,7 +816,6 @@
<param lifeTime="3600" />
<param expMultiplier="0.1" />
</effect>
<effect name="ConsumeBody" />
</enchant1for>
</skill>
<skill id="1155" levels="15" name="Corpse Burst" enchantGroup1="2" enchantGroup2="2">

14
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java vendored
View File

@@ -16,11 +16,15 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skill.BuffInfo;
import org.l2jmobius.gameserver.model.skill.EffectScope;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.taskmanager.DecayTaskManager;
/**
* Consume Body effect implementation.
@@ -47,6 +51,14 @@ public class ConsumeBody extends AbstractEffect
return;
}
((Npc) info.getEffected()).endDecayTask();
if (info.getSkill().hasEffects(EffectScope.START))
{
DecayTaskManager.getInstance().cancel(info.getEffected());
ThreadPool.schedule(() -> info.getEffected().onDecay(), Formulas.calcAtkSpd(info.getEffector(), info.getSkill(), info.getSkill().getHitTime() + info.getSkill().getCoolTime()));
}
else
{
((Npc) info.getEffected()).endDecayTask();
}
}
}

2
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -65,7 +65,7 @@ public class Summon extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
if (!info.getEffected().isPlayer() || info.getEffected().hasSummon())
if (!info.getEffector().isPlayer() || info.getEffector().hasSummon())
{
return;
}

10
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/01100-01199.xml vendored
View File

@@ -430,6 +430,9 @@
<cond>
<player canSummon="true" />
</cond>
<startEffects>
<effect name="ConsumeBody" />
</startEffects>
<for>
<effect name="Summon">
<param npcId="#npcIds" />
@@ -437,7 +440,6 @@
<param lifeTime="3600" />
<param expMultiplier="0.85" />
</effect>
<effect name="ConsumeBody" />
</for>
<enchant1for>
<effect name="Summon">
@@ -446,7 +448,6 @@
<param lifeTime="3600" />
<param expMultiplier="#summonExpMultiplierEnch" />
</effect>
<effect name="ConsumeBody" />
</enchant1for>
</skill>
<skill id="1139" levels="2" name="Servitor Magic Shield" enchantGroup1="1" enchantGroup2="1">
@@ -802,13 +803,15 @@
<cond>
<player canSummon="true" />
</cond>
<startEffects>
<effect name="ConsumeBody" />
</startEffects>
<for>
<effect name="Summon">
<param npcId="#npcIds" />
<param lifeTime="3600" />
<param expMultiplier="0.1" />
</effect>
<effect name="ConsumeBody" />
</for>
<enchant1for>
<effect name="Summon">
@@ -816,7 +819,6 @@
<param lifeTime="3600" />
<param expMultiplier="0.1" />
</effect>
<effect name="ConsumeBody" />
</enchant1for>
</skill>
<skill id="1155" levels="15" name="Corpse Burst" enchantGroup1="2" enchantGroup2="2">

14
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ConsumeBody.java vendored
View File

@@ -16,11 +16,15 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skill.BuffInfo;
import org.l2jmobius.gameserver.model.skill.EffectScope;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.taskmanager.DecayTaskManager;
/**
* Consume Body effect implementation.
@@ -47,6 +51,14 @@ public class ConsumeBody extends AbstractEffect
return;
}
((Npc) info.getEffected()).endDecayTask();
if (info.getSkill().hasEffects(EffectScope.START))
{
DecayTaskManager.getInstance().cancel(info.getEffected());
ThreadPool.schedule(() -> info.getEffected().onDecay(), Formulas.calcAtkSpd(info.getEffector(), info.getSkill(), info.getSkill().getHitTime() + info.getSkill().getCoolTime()));
}
else
{
((Npc) info.getEffected()).endDecayTask();
}
}
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -65,7 +65,7 @@ public class Summon extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
if (!info.getEffected().isPlayer() || info.getEffected().hasSummon())
if (!info.getEffector().isPlayer() || info.getEffector().hasSummon())
{
return;
}