projectswg/pswgcommon
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/pswgcommon.git synced 2026-01-17 00:04:25 -05:00
Code Issues Projects Releases Wiki Activity

Added missing count variables to ResourceWeight

Browse Source
This commit is contained in:
Ziggy
2023-07-28 23:51:04 +02:00
parent 084b1c8c24
commit d494cf8d49
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/projectswg/common/network/packets/swg/zone/resource/ResourceWeight.java
View File

@@ -55,15 +55,14 @@ public class ResourceWeight extends ObjectController {
decodeHeader(data);
schematicId = data.getInt();
schematicCrc = data.getInt();
int count = data.getByte();
decodeWeights(data, attributes, count);
decodeWeights(data, resourceMaxWeights, count);
decodeWeights(data, attributes);
decodeWeights(data, resourceMaxWeights);
packetAssert(attributes.size() == resourceMaxWeights.size(), "attributes must equal resource weight size");
}
@Override
public NetBuffer encode() {
int len = HEADER_LENGTH + 9;
int len = HEADER_LENGTH + 14;
for (List<Weight> weights : attributes.values())
len += 3 + weights.size();
for (List<Weight> weights : resourceMaxWeights.values())
@@ -71,13 +70,16 @@ public class ResourceWeight extends ObjectController {
packetAssert(attributes.size() == resourceMaxWeights.size(), "attributes must equal resource weight size");
NetBuffer data = NetBuffer.allocate(len);
encodeHeader(data);
data.addInt(schematicId);
data.addInt(schematicCrc);
encodeWeights(data, attributes);
encodeWeights(data, resourceMaxWeights);
data.addInt(attributes.size());
return data;
}
private void decodeWeights(NetBuffer data, Map<Integer, List<Weight>> map, int count) {
private void decodeWeights(NetBuffer data, Map<Integer, List<Weight>> map) {
byte count = data.getByte();
for (int i = 0; i < count; i++) {
data.getByte(); // index
int slot = data.getByte();
@@ -93,6 +95,7 @@ public class ResourceWeight extends ObjectController {
private void encodeWeights(NetBuffer data, Map<Integer, List<Weight>> map) {
int i = 0;
data.addByte(map.size());
for (Entry<Integer, List<Weight>> e : map.entrySet()) {
List<Weight> weights = e.getValue();
data.addByte(i++);