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

Fixed possible RequestAcquireSkillInfo NPE.

Browse Source
This commit is contained in:
MobiusDev 2017-09-15 14:40:37 +00:00
parent e44fbf0218
commit 74f3eab7e6
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
View File

@ -67,7 +67,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket
} }
final L2Npc trainer = activeChar.getLastFolkNPC(); final L2Npc trainer = activeChar.getLastFolkNPC();
if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) if ((trainer == null) || (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)))
{ {
return; return;
} }
@ -90,7 +90,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket
{ {
if (prevSkillLevel == _level) if (prevSkillLevel == _level)
{ {
_log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is trequesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!");
} }
else if (prevSkillLevel != (_level - 1)) else if (prevSkillLevel != (_level - 1))
{ {

4
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
View File

@ -67,7 +67,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket
} }
final L2Npc trainer = activeChar.getLastFolkNPC(); final L2Npc trainer = activeChar.getLastFolkNPC();
if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) if ((trainer == null) || (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)))
{ {
return; return;
} }
@ -90,7 +90,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket
{ {
if (prevSkillLevel == _level) if (prevSkillLevel == _level)
{ {
_log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is trequesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!");
} }
else if (prevSkillLevel != (_level - 1)) else if (prevSkillLevel != (_level - 1))
{ {

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
View File

@ -67,7 +67,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket
} }
final L2Npc trainer = activeChar.getLastFolkNPC(); final L2Npc trainer = activeChar.getLastFolkNPC();
if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) if ((trainer == null) || (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)))
{ {
return; return;
} }
@ -90,7 +90,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket
{ {
if (prevSkillLevel == _level) if (prevSkillLevel == _level)
{ {
_log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is trequesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!");
} }
else if (prevSkillLevel != (_level - 1)) else if (prevSkillLevel != (_level - 1))
{ {

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
View File

@ -63,7 +63,7 @@ public final class RequestAcquireSkillInfo extends L2GameClientPacket
} }
final L2Npc trainer = activeChar.getLastFolkNPC(); final L2Npc trainer = activeChar.getLastFolkNPC();
if (!(trainer instanceof L2NpcInstance)) if ((trainer == null) || !(trainer instanceof L2NpcInstance))
{ {
return; return;
} }
@ -86,7 +86,7 @@ public final class RequestAcquireSkillInfo extends L2GameClientPacket
{ {
if (prevSkillLevel == _level) if (prevSkillLevel == _level)
{ {
_log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is trequesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!");
} }
else if (prevSkillLevel != (_level - 1)) else if (prevSkillLevel != (_level - 1))
{ {

4
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
View File

@ -67,7 +67,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket
} }
final L2Npc trainer = activeChar.getLastFolkNPC(); final L2Npc trainer = activeChar.getLastFolkNPC();
if (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)) if ((trainer == null) || (!(trainer instanceof L2NpcInstance) && (_skillType != AcquireSkillType.CLASS)))
{ {
return; return;
} }
@ -90,7 +90,7 @@ public final class RequestAcquireSkillInfo implements IClientIncomingPacket
{ {
if (prevSkillLevel == _level) if (prevSkillLevel == _level)
{ {
_log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is trequesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!"); _log.warning(RequestAcquireSkillInfo.class.getSimpleName() + ": Player " + activeChar.getName() + " is requesting info for a skill that already knows, Id: " + _id + " level: " + _level + "!");
} }
else if (prevSkillLevel != (_level - 1)) else if (prevSkillLevel != (_level - 1))
{ {