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

Refactored NPC display state functions.

Browse Source
This commit is contained in:
MobiusDev
2015-10-13 12:46:58 +00:00
parent aa2a04b466
commit c39ac887e3
13 changed files with 56 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
trunk/java/com/l2jserver/gameserver/model/actor/L2Npc.java
View File

@ -141,7 +141,7 @@ public class L2Npc extends L2Character
private int _soulshotamount = 0;
private int _spiritshotamount = 0;
private int _state = 0;
private int _displayEffect = 0;
private int _shotsMask = 0;
private int _killingBlowWeaponId;
@ -1423,23 +1423,18 @@ public class L2Npc extends L2Character
return getTemplate().getAIType();
}
public void setState(int state)
public void setDisplayEffect(int val)
{
if (state != _state)
if (val != _displayEffect)
{
_state = state;
broadcastPacket(new ExChangeNpcState(getObjectId(), state));
_displayEffect = val;
broadcastPacket(new ExChangeNpcState(getObjectId(), val));
}
}
public boolean isState(int state)
public int getDisplayEffect()
{
return _state == state;
}
public int getState()
{
return _state;
return _displayEffect;
}
public int getColorEffect()

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/NpcInfo.java
View File

@ -89,7 +89,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
addComponentType(NpcInfoType.TEAM);
}
if (npc.getState() > 0)
if (npc.getDisplayEffect() > 0)
{
addComponentType(NpcInfoType.DISPLAY_EFFECT);
}
@ -327,7 +327,7 @@ public class NpcInfo extends AbstractMaskPacket<NpcInfoType>
}
if (containsMask(NpcInfoType.DISPLAY_EFFECT))
{
writeD(_npc.getState());
writeD(_npc.getDisplayEffect());
}
if (containsMask(NpcInfoType.TRANSFORMATION))
{