projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-02 17:12:57 -04:00
Code Issues Projects Releases Wiki Activity

Added a check if the flag is null to UpdatePvpStatusMessage

Browse Source
This commit is contained in:
Zach
2015-09-27 20:04:58 -04:00
parent 4745883814
commit 78ec1be0cd
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/packets/swg/zone/UpdatePvpStatusMessage.java
+11 -2
View File
@@ -37,7 +37,7 @@ import resources.PvpFlag;
public class UpdatePvpStatusMessage extends SWGPacket {
public static final int CRC = getCrc("UpdatePvpStatusMessage");
private PvpFlag flag = PvpFlag.OVERT;
private PvpFlag flag = PvpFlag.PLAYER;
private int playerFaction = 0;
private long objId = 0;
@@ -55,7 +55,16 @@ public class UpdatePvpStatusMessage extends SWGPacket {
if (!super.decode(data, CRC))
return;
EnumSet<PvpFlag> flags = PvpFlag.getFlags(getInt(data));
flag = flags.iterator().next();
PvpFlag tempFlag = flags.iterator().next();
if (tempFlag!= null)
{
flag = flags.iterator().next();
}
else
{
flag = PvpFlag.PLAYER;
}
playerFaction = getInt(data);
objId = getLong(data);
}