projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-31 01:15:57 -04:00
Code Issues Projects Releases Wiki Activity

Fixed major counter-type collection bugs

Browse Source
This commit is contained in:
Treeku
2014-03-23 15:08:46 +00:00
parent d1fff9e069
commit efdb69ff57
2 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/common/Stf.java
+14
View File
@@ -80,6 +80,20 @@ public class Stf extends Delta {
}
}
public String getString() {
synchronized(objectMutex) {
return ("@" + stfFilename + ":" + stfName);
}
}
public void setString(String stf) {
synchronized(objectMutex) {
stf = stf.replace("@", "");
stfFilename.set(stf.split(":")[0]);
stfName.set(stf.split(":")[1]);
}
}
public byte[] getBytes() {
synchronized(objectMutex) {
int size = stfFilename.getBytes().length + 4 + stfName.getBytes().length;
src/services/collections/CollectionService.java
+17 -14
View File
@@ -222,11 +222,8 @@ public class CollectionService implements INetworkDispatch {
BitSet bitValue = new BitSet(64);
bitValue.set(64-bits, 64);
BitSet maxValue = new BitSet(64);
maxValue.set(64-maxSlotValue, 64);
if (bitValue.toLongArray()[0] < maxValue.toLongArray()[0]) {
System.out.println(slotName + ", row " + c + ": counter-type slot uses " + bits + " bits, which can only hold a max value of " + bitValue.toLongArray()[0] + ", which is less than the specified max value of " + maxValue.toLongArray()[0]);
if (bitValue.toLongArray()[0] < maxSlotValue) {
System.out.println(slotName + ", row " + c + ": counter-type slot uses " + bits + " bits, which can only hold a max value of " + bitValue.toLongArray()[0] + ", which is less than the specified max value of " + maxSlotValue);
throw new Exception();
}
}
@@ -293,14 +290,20 @@ public class CollectionService implements INetworkDispatch {
}
}
if (bits > 1) {
if (maxSlotValue > -1) {
BitSet value = BitSet.valueOf(new long[] { collections.get(beginSlotId, (endSlotId + 1)).toLongArray()[0]++ });
for (int i = beginSlotId; i <= endSlotId; i++) {
collections.set(i, value.get((i - beginSlotId)));
}
} else if (bits > 1) {
int nextBit = collections.get(beginSlotId, (endSlotId + 1)).previousClearBit(endSlotId);
if (nextBit == -1) {
return false;
}
collections.set((beginSlotId + nextBit));
collections.set(nextBit);
} else {
collections.set(beginSlotId);
}
@@ -439,7 +442,6 @@ public class CollectionService implements INetworkDispatch {
String bookName = "";
String pageName = "";
String collectionName = "";
boolean collectionComplete = false;
collections = BitSet.valueOf(player.getCollections());
@@ -595,14 +597,15 @@ public class CollectionService implements INetworkDispatch {
BitSet bitValue = new BitSet(64);
bitValue.set(64-bits, 64);
BitSet maxValue = new BitSet(64);
maxValue.set(64-maxSlotValue, 64);
if (bitValue.toLongArray()[0] < maxValue.toLongArray()[0]) {
System.out.println(slotName + ", row " + c + ": counter-type slot uses " + bits + " bits, which can only hold a max value of " + bitValue.toLongArray()[0] + ", which is less than the specified max value of " + maxValue.toLongArray()[0]);
if (bitValue.toLongArray()[0] < maxSlotValue) {
System.out.println(slotName + ", row " + c + ": counter-type slot uses " + bits + " bits, which can only hold a max value of " + bitValue.toLongArray()[0] + ", which is less than the specified max value of " + maxSlotValue);
throw new Exception();
}
}
if (maxSlotValue > 0) {
return (int) collections.get(beginSlotId, (endSlotId + 1)).toLongArray()[0];
} else {
return collections.get(beginSlotId, (endSlotId + 1)).cardinality();
}
} else {