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

Fixed NPEs when trying to use non-existent summon skills.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2019-10-06 16:39:00 +00:00
parent de8f251a6a
commit 2f53082a4f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
View File

@@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.model.actor.instance.SiegeFlagInstance;
import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance; import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect; import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.effects.EffectType; import org.l2jmobius.gameserver.model.effects.EffectType;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.AbnormalType;
import org.l2jmobius.gameserver.model.skills.BuffInfo; import org.l2jmobius.gameserver.model.skills.BuffInfo;
import org.l2jmobius.gameserver.model.skills.Skill; import org.l2jmobius.gameserver.model.skills.Skill;
@@ -1169,8 +1170,14 @@ public class RequestActionUse implements IClientIncomingPacket
return; return;
} }
} }
final Skill skill = summon.getTemplate().getParameters().getSkillHolder(skillName).getSkill();
final SkillHolder skillHolder = summon.getTemplate().getParameters().getSkillHolder(skillName);
if (skillHolder == null)
{
return;
}
final Skill skill = skillHolder.getSkill();
if (skill != null) if (skill != null)
{ {
summon.setTarget(target); summon.setTarget(target);