Do not show clan crest on monsters.
Contributed by NightBR.
This commit is contained in:
@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
|
|||||||
if (npc.getClanId() > 0)
|
if (npc.getClanId() > 0)
|
||||||
{
|
{
|
||||||
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
||||||
if (clan != null)
|
if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
_clanId = clan.getId();
|
_clanId = clan.getId();
|
||||||
_clanCrest = clan.getCrestId();
|
_clanCrest = clan.getCrestId();
|
||||||
|
@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
|
|||||||
if (npc.getClanId() > 0)
|
if (npc.getClanId() > 0)
|
||||||
{
|
{
|
||||||
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
||||||
if (clan != null)
|
if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
_clanId = clan.getId();
|
_clanId = clan.getId();
|
||||||
_clanCrest = clan.getCrestId();
|
_clanCrest = clan.getCrestId();
|
||||||
|
@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
|
|||||||
if (npc.getClanId() > 0)
|
if (npc.getClanId() > 0)
|
||||||
{
|
{
|
||||||
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
||||||
if (clan != null)
|
if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
_clanId = clan.getId();
|
_clanId = clan.getId();
|
||||||
_clanCrest = clan.getCrestId();
|
_clanCrest = clan.getCrestId();
|
||||||
|
@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
|
|||||||
if (npc.getClanId() > 0)
|
if (npc.getClanId() > 0)
|
||||||
{
|
{
|
||||||
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
||||||
if (clan != null)
|
if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
_clanId = clan.getId();
|
_clanId = clan.getId();
|
||||||
_clanCrest = clan.getCrestId();
|
_clanCrest = clan.getCrestId();
|
||||||
|
@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
|
|||||||
if (npc.getClanId() > 0)
|
if (npc.getClanId() > 0)
|
||||||
{
|
{
|
||||||
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
||||||
if (clan != null)
|
if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
_clanId = clan.getId();
|
_clanId = clan.getId();
|
||||||
_clanCrest = clan.getCrestId();
|
_clanCrest = clan.getCrestId();
|
||||||
|
@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
|
|||||||
if (npc.getClanId() > 0)
|
if (npc.getClanId() > 0)
|
||||||
{
|
{
|
||||||
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
||||||
if (clan != null)
|
if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
_clanId = clan.getId();
|
_clanId = clan.getId();
|
||||||
_clanCrest = clan.getCrestId();
|
_clanCrest = clan.getCrestId();
|
||||||
|
@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
|
|||||||
if (npc.getClanId() > 0)
|
if (npc.getClanId() > 0)
|
||||||
{
|
{
|
||||||
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
||||||
if (clan != null)
|
if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
_clanId = clan.getId();
|
_clanId = clan.getId();
|
||||||
_clanCrest = clan.getCrestId();
|
_clanCrest = clan.getCrestId();
|
||||||
|
@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
|
|||||||
if (npc.getClanId() > 0)
|
if (npc.getClanId() > 0)
|
||||||
{
|
{
|
||||||
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
||||||
if (clan != null)
|
if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
_clanId = clan.getId();
|
_clanId = clan.getId();
|
||||||
_clanCrest = clan.getCrestId();
|
_clanCrest = clan.getCrestId();
|
||||||
|
@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
|
|||||||
if (npc.getClanId() > 0)
|
if (npc.getClanId() > 0)
|
||||||
{
|
{
|
||||||
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
||||||
if (clan != null)
|
if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
_clanId = clan.getId();
|
_clanId = clan.getId();
|
||||||
_clanCrest = clan.getCrestId();
|
_clanCrest = clan.getCrestId();
|
||||||
|
@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
|
|||||||
if (npc.getClanId() > 0)
|
if (npc.getClanId() > 0)
|
||||||
{
|
{
|
||||||
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
||||||
if (clan != null)
|
if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
_clanId = clan.getId();
|
_clanId = clan.getId();
|
||||||
_clanCrest = clan.getCrestId();
|
_clanCrest = clan.getCrestId();
|
||||||
|
@ -177,7 +177,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
|
|||||||
if (npc.getClanId() > 0)
|
if (npc.getClanId() > 0)
|
||||||
{
|
{
|
||||||
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
final Clan clan = ClanTable.getInstance().getClan(npc.getClanId());
|
||||||
if (clan != null)
|
if ((clan != null) && !npc.isMonster() && npc.isInsideZone(ZoneId.PEACE))
|
||||||
{
|
{
|
||||||
_clanId = clan.getId();
|
_clanId = clan.getId();
|
||||||
_clanCrest = clan.getCrestId();
|
_clanCrest = clan.getCrestId();
|
||||||
|
Reference in New Issue
Block a user