From c0b7a1a55c1baea0a53578902418c2a0f158ae70 Mon Sep 17 00:00:00 2001 From: Josh Larson Date: Sat, 30 Jul 2022 16:38:08 -0500 Subject: [PATCH] Fixed Holocore-666 "AFK not showing" --- .../resources/support/data/collections/SWGFlag.java | 11 +++++------ .../resources/support/global/player/PlayerFlags.java | 8 +++++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/projectswg/holocore/resources/support/data/collections/SWGFlag.java b/src/main/java/com/projectswg/holocore/resources/support/data/collections/SWGFlag.java index 771b4d41d..ac3567aff 100644 --- a/src/main/java/com/projectswg/holocore/resources/support/data/collections/SWGFlag.java +++ b/src/main/java/com/projectswg/holocore/resources/support/data/collections/SWGFlag.java @@ -29,14 +29,13 @@ package com.projectswg.holocore.resources.support.data.collections; import com.projectswg.common.encoding.Encodable; import com.projectswg.common.network.NetBuffer; import com.projectswg.holocore.resources.support.objects.swg.SWGObject; +import org.jetbrains.annotations.NotNull; import java.util.Arrays; import java.util.BitSet; public class SWGFlag extends BitSet implements Encodable { - private static final long serialVersionUID = 2L; - private final int view; private final int updateType; @@ -55,12 +54,12 @@ public class SWGFlag extends BitSet implements Encodable { } @Override - public byte[] encode() { + public byte @NotNull [] encode() { byte [] encoded = toByteArray(); - int length = (int) Math.ceil(encoded.length / 4.0); + int resultingInts = (encoded.length + 3) / 4; // rounds up - NetBuffer buffer = NetBuffer.allocate((length + 1) * 4); - buffer.addInt(length); + NetBuffer buffer = NetBuffer.allocate(4 + resultingInts * 4); + buffer.addInt(resultingInts); buffer.addRawArray(encoded); return buffer.array(); } diff --git a/src/main/java/com/projectswg/holocore/resources/support/global/player/PlayerFlags.java b/src/main/java/com/projectswg/holocore/resources/support/global/player/PlayerFlags.java index 4a5075348..8afa5b594 100644 --- a/src/main/java/com/projectswg/holocore/resources/support/global/player/PlayerFlags.java +++ b/src/main/java/com/projectswg/holocore/resources/support/global/player/PlayerFlags.java @@ -52,7 +52,13 @@ public enum PlayerFlags { /** Display the Faction Rank */ FACTIONRANK (9), /** Display the player's location in the matchmaking search */ - DISPLAY_LOCATION_IN_SEARCH (10); + DISPLAY_LOCATION_IN_SEARCH (10), + /** Out of Character */ + OUT_OF_CHARACTER (11), + /** Looking For Work */ + LOOKING_FOR_WORK (13), + /** Anonymous */ + ANONYMOUS (127); private static final PlayerFlags [] FLAGS = values();