Do not show clan crest on monsters.

Contributed by NightBR.
This commit is contained in:
MobiusDevelopment
2019-03-28 13:43:26 +00:00
parent 86d473239a
commit fdc8b91095
11 changed files with 11 additions and 11 deletions

View File

@ -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();

View File

@ -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();

View File

@ -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();

View File

@ -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();

View File

@ -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();

View File

@ -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();

View File

@ -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();

View File

@ -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();

View File

@ -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();

View File

@ -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();

View File

@ -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();