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

Renamed ListObject -> Delta. Guild null fix

Browse Source 
Delete your ODB for this
This commit is contained in:
Treeku
2013-12-12 14:17:50 +00:00
parent 2ff1a8e803
commit 001bf1b390
14 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/SWGMap.java
+7 -7
View File
@@ -112,17 +112,17 @@ public class SWGMap<K, V> implements Map<K, V> {
synchronized(objectMutex) {
if ((key instanceof String || key instanceof Byte || key instanceof Short ||
key instanceof Integer || key instanceof Float ||key instanceof Long) &&
value instanceof IListObject) {
value instanceof IDelta) {
if (map.containsKey(key)) {
V oldValue = map.put(key, value);
queue(item(2, (String) key, ((IListObject) value).getBytes(), true, true));
queue(item(2, (String) key, ((IDelta) value).getBytes(), true, true));
return oldValue;
} else {
V oldValue = map.put(key, value);
queue(item(0, (String) key, ((IListObject) value).getBytes(), true, true));
queue(item(0, (String) key, ((IDelta) value).getBytes(), true, true));
return oldValue;
}
@@ -142,14 +142,14 @@ public class SWGMap<K, V> implements Map<K, V> {
if (key instanceof String || key instanceof Byte || key instanceof Short ||
key instanceof Integer || key instanceof Float || key instanceof Long ||
value instanceof IListObject) {
value instanceof IDelta) {
if (map.containsKey(key)) {
if (map.put(key, value) != null) {
buffer.add(item(2, (String) key, ((IListObject) value).getBytes(), true, true));
buffer.add(item(2, (String) key, ((IDelta) value).getBytes(), true, true));
}
} else {
if (map.put(key, value) != null) {
buffer.add(item(0, (String) key, ((IListObject) value).getBytes(), true, true));
buffer.add(item(0, (String) key, ((IDelta) value).getBytes(), true, true));
}
}
}
@@ -167,7 +167,7 @@ public class SWGMap<K, V> implements Map<K, V> {
key instanceof Integer || key instanceof Float || key instanceof Long) {
V value = map.remove(key);
queue(item(1, key, ((IListObject) map.get(key)).getBytes(), true, true));
queue(item(1, key, ((IDelta) map.get(key)).getBytes(), true, true));
return value;
}