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

Fixed possible AbstractNpcInfo NPE.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDev
2018-05-30 21:06:47 +00:00
parent aafd0051e8
commit 287a5b30f7
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java
View File

@@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2TrapInstance; import com.l2jmobius.gameserver.model.actor.instance.L2TrapInstance;
import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
import com.l2jmobius.gameserver.model.zone.ZoneId; import com.l2jmobius.gameserver.model.zone.ZoneId;
import com.l2jmobius.gameserver.model.zone.type.L2TownZone;
import com.l2jmobius.gameserver.network.OutgoingPackets; import com.l2jmobius.gameserver.network.OutgoingPackets;
public abstract class AbstractNpcInfo implements IClientOutgoingPacket public abstract class AbstractNpcInfo implements IClientOutgoingPacket
@@ -127,14 +128,18 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket
// npc crest of owning clan/ally of castle // npc crest of owning clan/ally of castle
if ((cha instanceof L2NpcInstance) && cha.isInsideZone(ZoneId.TOWN) && (Config.SHOW_CREST_WITHOUT_QUEST || cha.getCastle().getShowNpcCrest()) && (cha.getCastle().getOwnerId() != 0)) if ((cha instanceof L2NpcInstance) && cha.isInsideZone(ZoneId.TOWN) && (Config.SHOW_CREST_WITHOUT_QUEST || cha.getCastle().getShowNpcCrest()) && (cha.getCastle().getOwnerId() != 0))
{ {
final int townId = TownManager.getTown(_x, _y, _z).getTownId(); final L2TownZone town = TownManager.getTown(_x, _y, _z);
if ((townId != 33) && (townId != 22)) if (town != null)
{ {
final L2Clan clan = ClanTable.getInstance().getClan(cha.getCastle().getOwnerId()); final int townId = town.getTownId();
_clanCrest = clan.getCrestId(); if ((townId != 33) && (townId != 22))
_clanId = clan.getId(); {
_allyCrest = clan.getAllyCrestId(); final L2Clan clan = ClanTable.getInstance().getClan(cha.getCastle().getOwnerId());
_allyId = clan.getAllyId(); _clanCrest = clan.getCrestId();
_clanId = clan.getId();
_allyCrest = clan.getAllyCrestId();
_allyId = clan.getAllyId();
}
} }
} }