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

Fixed pomanders disappearing when they should not during subclass cancel.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment 2019-12-16 17:28:52 +00:00
parent f479e59687
commit d372391bef
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java vendored
View File

@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType;
import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.PlayerCondOverride;
import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.base.ClassId;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionCancel; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionCancel;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange;
import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder;
@ -77,7 +78,8 @@ public class SkillTransfer extends AbstractNpcAI
public void onProfessionCancel(OnPlayerProfessionCancel event) public void onProfessionCancel(OnPlayerProfessionCancel event)
{ {
final PlayerInstance player = event.getPlayer(); final PlayerInstance player = event.getPlayer();
final int index = getTransferClassIndex(player); final ClassId classId = ClassId.getClassId(event.getClassId());
final int index = getTransferClassIndex(classId);
// is a transfer class // is a transfer class
if (index < 0) if (index < 0)
@ -144,7 +146,12 @@ public class SkillTransfer extends AbstractNpcAI
private static int getTransferClassIndex(PlayerInstance player) private static int getTransferClassIndex(PlayerInstance player)
{ {
switch (player.getClassId()) return getTransferClassIndex(player.getClassId());
}
private static int getTransferClassIndex(ClassId classId)
{
switch (classId)
{ {
case CARDINAL: case CARDINAL:
{ {

11
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java vendored
View File

@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType;
import org.l2jmobius.gameserver.model.PlayerCondOverride; import org.l2jmobius.gameserver.model.PlayerCondOverride;
import org.l2jmobius.gameserver.model.SkillLearn; import org.l2jmobius.gameserver.model.SkillLearn;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.base.ClassId;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionCancel; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionCancel;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerProfessionChange;
import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder;
@ -77,7 +78,8 @@ public class SkillTransfer extends AbstractNpcAI
public void onProfessionCancel(OnPlayerProfessionCancel event) public void onProfessionCancel(OnPlayerProfessionCancel event)
{ {
final PlayerInstance player = event.getPlayer(); final PlayerInstance player = event.getPlayer();
final int index = getTransferClassIndex(player); final ClassId classId = ClassId.getClassId(event.getClassId());
final int index = getTransferClassIndex(classId);
// is a transfer class // is a transfer class
if (index < 0) if (index < 0)
@ -144,7 +146,12 @@ public class SkillTransfer extends AbstractNpcAI
private static int getTransferClassIndex(PlayerInstance player) private static int getTransferClassIndex(PlayerInstance player)
{ {
switch (player.getClassId()) return getTransferClassIndex(player.getClassId());
}
private static int getTransferClassIndex(ClassId classId)
{
switch (classId)
{ {
case CARDINAL: case CARDINAL:
{ {