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

Addition of SkillFinishType enumeration.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-08-18 16:39:21 +00:00
parent c2d8864dd7
commit 471b06e031
711 changed files with 3383 additions and 2072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/Maguen.java vendored
View File

@@ -17,6 +17,7 @@
package ai.areas.Gracia.AI;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.instancemanager.QuestManager;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Npc;
@@ -156,9 +157,9 @@ public class Maguen extends AbstractNpcAI
{
if (npc.getVariables().getInt("TEST_MAGUEN") == 1)
{
player.getEffectList().stopSkillEffects(true, B_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(true, C_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(true, R_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, B_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, C_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, R_PLASMA1.getSkill().getAbnormalType());
nemoAi().notifyEvent("DECREASE_COUNT", npc, player);
}
npc.doDie(null);
@@ -180,7 +181,7 @@ public class Maguen extends AbstractNpcAI
if ((b == 3) && (c == 0) && (r == 0))
{
showOnScreenMsg(player, NpcStringId.ENOUGH_MAGUEN_PLASMA_BISTAKON_HAVE_GATHERED, 2, 4000);
player.getEffectList().stopSkillEffects(true, B_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, B_PLASMA1.getSkill().getAbnormalType());
npc.setTarget(player);
npc.doCast((getRandom(100) < 70) ? B_BUFF_1.getSkill() : B_BUFF_2.getSkill());
maguenPetChance(player);
@@ -189,7 +190,7 @@ public class Maguen extends AbstractNpcAI
else if ((b == 0) && (c == 3) && (r == 0))
{
showOnScreenMsg(player, NpcStringId.ENOUGH_MAGUEN_PLASMA_COKRAKON_HAVE_GATHERED, 2, 4000);
player.getEffectList().stopSkillEffects(true, C_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, C_PLASMA1.getSkill().getAbnormalType());
npc.setTarget(player);
npc.doCast((getRandom(100) < 70) ? C_BUFF_1.getSkill() : C_BUFF_2.getSkill());
maguenPetChance(player);
@@ -198,7 +199,7 @@ public class Maguen extends AbstractNpcAI
else if ((b == 0) && (c == 0) && (r == 3))
{
showOnScreenMsg(player, NpcStringId.ENOUGH_MAGUEN_PLASMA_LEPTILIKON_HAVE_GATHERED, 2, 4000);
player.getEffectList().stopSkillEffects(true, R_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, R_PLASMA1.getSkill().getAbnormalType());
npc.setTarget(player);
npc.doCast((getRandom(100) < 70) ? R_BUFF_1.getSkill() : R_BUFF_2.getSkill());
maguenPetChance(player);
@@ -208,9 +209,9 @@ public class Maguen extends AbstractNpcAI
{
if ((b == 1) && (c == 1) && (r == 1))
{
player.getEffectList().stopSkillEffects(true, B_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(true, C_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(true, R_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, B_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, C_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, R_PLASMA1.getSkill().getAbnormalType());
showOnScreenMsg(player, NpcStringId.THE_PLASMAS_HAVE_FILLED_THE_AEROSCOPE_AND_ARE_HARMONIZED, 2, 4000);
SkillHolder skillToCast = null;
switch (getRandom(3))
@@ -243,9 +244,9 @@ public class Maguen extends AbstractNpcAI
else
{
showOnScreenMsg(player, NpcStringId.THE_PLASMAS_HAVE_FILLED_THE_AEROSCOPE_BUT_THEY_ARE_RAMMING_INTO_EACH_OTHER_EXPLODING_AND_DYING, 2, 4000);
player.getEffectList().stopSkillEffects(true, B_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(true, C_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(true, R_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, B_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, C_PLASMA1.getSkill().getAbnormalType());
player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, R_PLASMA1.getSkill().getAbnormalType());
}
}
else
@@ -268,9 +269,9 @@ public class Maguen extends AbstractNpcAI
final int i1 = info1 == null ? 0 : info1.getSkill().getAbnormalLevel();
final int i2 = info2 == null ? 0 : info2.getSkill().getAbnormalLevel();
final int i3 = info3 == null ? 0 : info3.getSkill().getAbnormalLevel();
caster.getEffectList().stopSkillEffects(true, B_PLASMA1.getSkill().getAbnormalType());
caster.getEffectList().stopSkillEffects(true, C_PLASMA1.getSkill().getAbnormalType());
caster.getEffectList().stopSkillEffects(true, R_PLASMA1.getSkill().getAbnormalType());
caster.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, B_PLASMA1.getSkill().getAbnormalType());
caster.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, C_PLASMA1.getSkill().getAbnormalType());
caster.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, R_PLASMA1.getSkill().getAbnormalType());
cancelQuestTimer("FIRST_TIMER", npc, caster);
cancelQuestTimer("SECOND_TIMER", npc, caster);
cancelQuestTimer("THIRD_TIMER", npc, caster);

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/BaseTower/BaseTower.java vendored
View File

@@ -21,6 +21,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.data.xml.DoorData;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
@@ -104,7 +105,7 @@ public class BaseTower extends AbstractNpcAI
final PlayerInstance pl = BODY_DESTROYER_TARGET_LIST.get(npc.getObjectId());
if ((pl != null) && pl.isOnline() && !pl.isDead())
{
pl.stopSkillEffects(true, DEATH_WORD.getSkillId());
pl.stopSkillEffects(SkillFinishType.REMOVED, DEATH_WORD.getSkillId());
}
BODY_DESTROYER_TARGET_LIST.remove(npc.getObjectId());
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.concurrent.ScheduledFuture;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
@@ -190,7 +191,7 @@ public class UrbanArea extends AbstractInstance
cancelQuestTimer("rebuff", npc, null);
if (npc.isAffectedBySkill(STONE.getSkillId()))
{
npc.stopSkillEffects(false, STONE.getSkillId());
npc.stopSkillEffects(SkillFinishType.SILENT, STONE.getSkillId());
}
npc.broadcastSay(ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[0]);

7
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java vendored
View File

@@ -24,6 +24,7 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.concurrent.ThreadPool;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.quest.Event;
@@ -358,9 +359,9 @@ public class Race extends Event
player.standUp();
}
player.getEffectList().stopSkillEffects(true, AbnormalType.SPEED_UP);
player.stopSkillEffects(true, 268);
player.stopSkillEffects(true, 298); // Rabbit Spirit Totem
player.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, AbnormalType.SPEED_UP);
player.stopSkillEffects(SkillFinishType.REMOVED, 268);
player.stopSkillEffects(SkillFinishType.REMOVED, 298); // Rabbit Spirit Totem
SkillData.getInstance().getSkill(_skill, 1).applyEffects(player, player);
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/SavingSanta/SavingSanta.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.data.ItemTable;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
@@ -213,7 +214,7 @@ public class SavingSanta extends LongTimeEvent
// What a bunch of losers.
npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), NPC_STRINGS[6 + getRandom(2)]));
pl.broadcastPacket(new MagicSkillUse(pl, pl, 23023, 1, 3000, 1));
pl.getEffectList().stopSkillEffects(true, 23022);
pl.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, 23022);
}
else if ((result == 1) || (result == -2))
{

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@@ -23,6 +23,7 @@ import java.util.StringTokenizer;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.SkillTreeData;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.WorldObject;
@@ -362,7 +363,7 @@ public class AdminBuffs implements IAdminCommandHandler
{
if (target.isAffectedBySkill(skillId))
{
target.stopSkillEffects(true, skillId);
target.stopSkillEffects(SkillFinishType.REMOVED, skillId);
BuilderUtil.sendSysMessage(activeChar, "Removed skill ID: " + skillId + " effects from " + target.getName() + " (" + objId + ").");
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java vendored
View File

@@ -19,6 +19,7 @@ package handlers.admincommandhandlers;
import java.util.StringTokenizer;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.skills.Skill;
@@ -53,7 +54,7 @@ public class AdminSuperHaste implements IAdminCommandHandler
{
final int val = Integer.parseInt(st.nextToken());
final boolean sendMessage = player.isAffectedBySkill(SUPER_HASTE_ID);
player.stopSkillEffects((val == 0) && sendMessage, SUPER_HASTE_ID);
player.stopSkillEffects((val == 0) && sendMessage ? SkillFinishType.REMOVED : SkillFinishType.NORMAL, SUPER_HASTE_ID);
if ((val >= 1) && (val <= 4))
{
int time = 0;

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Detection.java vendored
View File

@@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.conditions.Condition;
@@ -65,7 +66,7 @@ public class Detection extends AbstractEffect
return;
}
// Remove Hide.
target.getEffectList().stopSkillEffects(true, AbnormalType.HIDE);
target.getEffectList().stopSkillEffects(SkillFinishType.REMOVED, AbnormalType.HIDE);
}
}
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelByCategory.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.effecthandlers;
import java.util.List;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -67,7 +68,7 @@ public class DispelByCategory extends AbstractEffect
final List<BuffInfo> canceled = Formulas.calcCancelStealEffects(info.getEffector(), info.getEffected(), info.getSkill(), _slot, _rate, _max);
for (BuffInfo can : canceled)
{
info.getEffected().getEffectList().stopSkillEffects(true, can.getSkill());
info.getEffected().getEffectList().stopSkillEffects(SkillFinishType.REMOVED, can.getSkill());
}
}
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java vendored
View File

@@ -21,6 +21,7 @@ import java.util.EnumMap;
import java.util.Map;
import java.util.Map.Entry;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.model.EffectList;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -101,7 +102,7 @@ public class DispelBySlot extends AbstractEffect
if ((entry.getKey() == toDispel.getSkill().getAbnormalType()) && ((entry.getValue() < 0) || (entry.getValue() >= toDispel.getSkill().getAbnormalLevel())))
{
effectList.stopSkillEffects(true, entry.getKey());
effectList.stopSkillEffects(SkillFinishType.REMOVED, entry.getKey());
}
}
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java vendored
View File

@@ -22,6 +22,7 @@ import java.util.Map;
import java.util.Map.Entry;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.model.EffectList;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -105,7 +106,7 @@ public class DispelBySlotProbability extends AbstractEffect
if ((toDispel.getSkill().getAbnormalType() == entry.getKey()) && (entry.getValue() >= toDispel.getSkill().getAbnormalLevel()))
{
effectList.stopSkillEffects(true, entry.getKey());
effectList.stopSkillEffects(SkillFinishType.REMOVED, entry.getKey());
}
}
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.effecthandlers;
import java.util.List;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.conditions.Condition;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -75,7 +76,7 @@ public class StealAbnormal extends AbstractEffect
stolen.setAbnormalTime(infoToSteal.getTime()); // Copy the remaining time.
// To include all the effects, it's required to go through the template rather the buff info.
infoToSteal.getSkill().applyEffectScope(EffectScope.GENERAL, stolen, true, true);
info.getEffected().getEffectList().remove(true, infoToSteal);
info.getEffected().getEffectList().remove(SkillFinishType.REMOVED, infoToSteal);
info.getEffector().getEffectList().add(stolen);
}
}

9
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java vendored
View File

@@ -23,6 +23,7 @@ import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.enums.InstanceReenterType;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -229,7 +230,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
{
if (!inst.getBuffExceptionList().contains(info.getSkill().getId()))
{
info.getEffected().getEffectList().stopSkillEffects(true, info.getSkill());
info.getEffected().getEffectList().stopSkillEffects(SkillFinishType.REMOVED, info.getSkill());
}
}
@@ -240,7 +241,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
{
if (!inst.getBuffExceptionList().contains(info.getSkill().getId()))
{
info.getEffected().getEffectList().stopSkillEffects(true, info.getSkill());
info.getEffected().getEffectList().stopSkillEffects(SkillFinishType.REMOVED, info.getSkill());
}
}
}
@@ -252,7 +253,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
{
if (inst.getBuffExceptionList().contains(info.getSkill().getId()))
{
info.getEffected().getEffectList().stopSkillEffects(true, info.getSkill());
info.getEffected().getEffectList().stopSkillEffects(SkillFinishType.REMOVED, info.getSkill());
}
}
@@ -263,7 +264,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
{
if (inst.getBuffExceptionList().contains(info.getSkill().getId()))
{
info.getEffected().getEffectList().stopSkillEffects(true, info.getSkill());
info.getEffected().getEffectList().stopSkillEffects(SkillFinishType.REMOVED, info.getSkill());
}
}
}

21
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.enums.InstanceReenterType;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.enums.TrapAction;
import org.l2jmobius.gameserver.geoengine.GeoEngine;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
@@ -983,7 +984,7 @@ public class CrystalCaverns extends AbstractInstance
}
if (world._dragonClawNeed == 0)
{
npc.stopSkillEffects(false, 5225);
npc.stopSkillEffects(SkillFinishType.SILENT, 5225);
npc.broadcastPacket(new MagicSkillUse(npc, npc, 5480, 1, 4000, 0));
if (world._raidStatus == 3)
{
@@ -1127,7 +1128,7 @@ public class CrystalCaverns extends AbstractInstance
if (player.getInstanceId() == world.getInstanceId())
{
teleportPlayer(player, new Location(144653, 152606, -12126), world.getInstanceId());
player.stopSkillEffects(true, 5239);
player.stopSkillEffects(SkillFinishType.REMOVED, 5239);
SkillData.getInstance().getSkill(5239, 1).applyEffects(player, player);
startQuestTimer("Timer2", 300000, npc, player);
}
@@ -1323,7 +1324,7 @@ public class CrystalCaverns extends AbstractInstance
}
else if (event.equalsIgnoreCase("baylor_remove_invul"))
{
npc.stopSkillEffects(false, 5225);
npc.stopSkillEffects(SkillFinishType.SILENT, 5225);
}
else if (event.equalsIgnoreCase("Baylor"))
{
@@ -1671,7 +1672,7 @@ public class CrystalCaverns extends AbstractInstance
{
for (PlayerInstance partyMember : party.getMembers())
{
partyMember.stopSkillEffects(true, 5239);
partyMember.stopSkillEffects(SkillFinishType.REMOVED, 5239);
}
}
cancelQuestTimers("Timer5");
@@ -1817,7 +1818,7 @@ public class CrystalCaverns extends AbstractInstance
{
if (partyMember.getInstanceId() == world.getInstanceId())
{
partyMember.stopSkillEffects(true, 5239);
partyMember.stopSkillEffects(SkillFinishType.REMOVED, 5239);
SkillData.getInstance().getSkill(5239, 2).applyEffects(partyMember, partyMember);
startQuestTimer("Timer3", 600000, npc, partyMember);
}
@@ -1825,7 +1826,7 @@ public class CrystalCaverns extends AbstractInstance
}
else
{
player.stopSkillEffects(true, 5239);
player.stopSkillEffects(SkillFinishType.REMOVED, 5239);
SkillData.getInstance().getSkill(5239, 2).applyEffects(player, player);
startQuestTimer("Timer3", 600000, npc, player);
}
@@ -1847,7 +1848,7 @@ public class CrystalCaverns extends AbstractInstance
{
if (partyMember.getInstanceId() == world.getInstanceId())
{
partyMember.stopSkillEffects(true, 5239);
partyMember.stopSkillEffects(SkillFinishType.REMOVED, 5239);
SkillData.getInstance().getSkill(5239, 4).applyEffects(partyMember, partyMember);
startQuestTimer("Timer4", 1200000, npc, partyMember);
}
@@ -1855,7 +1856,7 @@ public class CrystalCaverns extends AbstractInstance
}
else
{
player.stopSkillEffects(true, 5239);
player.stopSkillEffects(SkillFinishType.REMOVED, 5239);
SkillData.getInstance().getSkill(5239, 4).applyEffects(player, player);
startQuestTimer("Timer4", 1200000, npc, player);
}
@@ -1877,7 +1878,7 @@ public class CrystalCaverns extends AbstractInstance
{
if (partyMember.getInstanceId() == world.getInstanceId())
{
partyMember.stopSkillEffects(true, 5239);
partyMember.stopSkillEffects(SkillFinishType.REMOVED, 5239);
SkillData.getInstance().getSkill(5239, 3).applyEffects(partyMember, partyMember);
startQuestTimer("Timer5", 900000, npc, partyMember);
}
@@ -1885,7 +1886,7 @@ public class CrystalCaverns extends AbstractInstance
}
else
{
player.stopSkillEffects(true, 5239);
player.stopSkillEffects(SkillFinishType.REMOVED, 5239);
SkillData.getInstance().getSkill(5239, 3).applyEffects(player, player);
startQuestTimer("Timer5", 900000, npc, player);
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java vendored
View File

@@ -27,6 +27,7 @@ import java.util.logging.Level;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
@@ -514,7 +515,7 @@ public class Kamaloka extends AbstractInstance
{
if ((info != null) && !info.getSkill().isStayAfterDeath() && (Arrays.binarySearch(BUFFS_WHITELIST, info.getSkill().getId()) < 0))
{
info.getEffected().getEffectList().stopSkillEffects(true, info.getSkill());
info.getEffected().getEffectList().stopSkillEffects(SkillFinishType.REMOVED, info.getSkill());
return true;
}
return false;

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java vendored
View File

@@ -25,6 +25,7 @@ import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.QuestSound;
import org.l2jmobius.gameserver.enums.SkillFinishType;
import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.actor.Attackable;
@@ -380,7 +381,7 @@ public class Q00311_ExpulsionOfEvilSpirits extends Quest
{
if (info.getSkill().getId() == DEBUFF_SKILL_ID)
{
info.getEffected().getEffectList().stopSkillEffects(true, DEBUFF_SKILL_ID);
info.getEffected().getEffectList().stopSkillEffects(SkillFinishType.REMOVED, DEBUFF_SKILL_ID);
}
}
_altar.broadcastPacket(new MagicSkillUse(_altar, player, DEBUFF_SKILL_ID, DEBUFF_SKILL_LEVEL, 1000, 0));