Fix MixedArrayList And MixedHashMap

MModding · Dec 5, 2023 · c105b9c · c105b9c
1 parent 0144de3
commit c105b9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/main/java/com/mmodding/mmodding_lib/library/utils/MixedArrayList.java b/src/main/java/com/mmodding/mmodding_lib/library/utils/MixedArrayList.java
@@ -28,6 +28,9 @@ public <E> boolean contains(Class<E> type, E e) {
 	@Override
 	public <E> E get(int index, Class<E> type) {
 		TypedObject<?> typed = super.get(index);
+		if (typed == null) {
+			typed = MixedMap.emptyValue(type);
+		}
 		if (type.equals(typed.getType())) {
 			return (E) typed.getValue();
 		}

diff --git a/src/main/java/com/mmodding/mmodding_lib/library/utils/MixedHashMap.java b/src/main/java/com/mmodding/mmodding_lib/library/utils/MixedHashMap.java
@@ -31,6 +31,9 @@ public <V> boolean containsValue(Class<V> type, V value) {
 	@Override
 	public <V> V get(K key, Class<V> type) {
 		TypedObject<?> typed = super.get(key);
+		if (typed == null) {
+			typed = MixedMap.emptyValue(type);
+		}
 		if (type.equals(typed.getType())) {
 			return (V) typed.getValue();
 		}