projectswg-bitbucket/pswgcommon
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/pswgcommon.git synced 2026-01-16 23:04:32 -05:00
Code Issues Projects Releases Wiki Activity

Changed UpdatePvpStatusMessage to use EnumSet for flags

Browse Source
This commit is contained in:
Josh Larson
2018-09-01 21:15:29 -05:00
parent 8fd885abff
commit 58df91a7fa
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/projectswg/common/network/packets/swg/zone/UpdatePvpStatusMessage.java
View File

@@ -26,29 +26,30 @@
***********************************************************************************/
package com.projectswg.common.network.packets.swg.zone;
import java.util.Arrays;
import java.util.EnumSet;
import com.projectswg.common.data.encodables.tangible.PvpFaction;
import com.projectswg.common.data.encodables.tangible.PvpFlag;
import com.projectswg.common.network.NetBuffer;
import com.projectswg.common.network.packets.SWGPacket;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Set;
public class UpdatePvpStatusMessage extends SWGPacket {
public static final int CRC = getCrc("UpdatePvpStatusMessage");
private PvpFlag[] pvpFlags;
private EnumSet<PvpFlag> pvpFlags;
private PvpFaction pvpFaction;
private long objId;
public UpdatePvpStatusMessage() {
pvpFlags = new PvpFlag[]{PvpFlag.PLAYER};
pvpFlags = EnumSet.noneOf(PvpFlag.class);
pvpFaction = PvpFaction.NEUTRAL;
objId = 0;
}
public UpdatePvpStatusMessage(PvpFaction pvpFaction, long objId, PvpFlag... pvpFlags) {
this.pvpFlags = pvpFlags;
public UpdatePvpStatusMessage(PvpFaction pvpFaction, long objId, Set<PvpFlag> pvpFlags) {
this.pvpFlags = EnumSet.copyOf(pvpFlags);
this.pvpFaction = pvpFaction;
this.objId = objId;
}
@@ -56,24 +57,18 @@ public class UpdatePvpStatusMessage extends SWGPacket {
public void decode(NetBuffer data) {
if (!super.checkDecode(data, CRC))
return;
EnumSet<PvpFlag> enumFlags = PvpFlag.getFlags(data.getInt());
pvpFlags = enumFlags.toArray(new PvpFlag[enumFlags.size()]);
pvpFlags = PvpFlag.getFlags(data.getInt());
pvpFaction = PvpFaction.getFactionForCrc(data.getInt());
objId = data.getLong();
}
public NetBuffer encode() {
int length = 22;
int flagBitmask = 0;
NetBuffer data = NetBuffer.allocate(length);
for(PvpFlag pvpFlag : pvpFlags)
flagBitmask |= pvpFlag.getBitmask();
NetBuffer data = NetBuffer.allocate(22);
data.addShort(4);
data.addInt(CRC);
data.addInt(flagBitmask);
data.addInt(pvpFlags.stream().mapToInt(PvpFlag::getBitmask).reduce(0, (a, b) -> a | b));
data.addInt(pvpFaction.getCrc());
data.addLong(objId);
return data;
@@ -81,14 +76,14 @@ public class UpdatePvpStatusMessage extends SWGPacket {
public long getObjectId() { return objId; }
public PvpFaction getPlayerFaction() { return pvpFaction; }
public PvpFlag[] getPvpFlags() { return pvpFlags; }
public Set<PvpFlag> getPvpFlags() { return Collections.unmodifiableSet(pvpFlags); }
@Override
protected String getPacketData() {
return createPacketInformation(
"objId", objId,
"faction", pvpFaction,
"flags", Arrays.toString(pvpFlags)
"flags", pvpFlags
);
}