From c105b9cf52a96739b392aff027618d532f42ecd7 Mon Sep 17 00:00:00 2001
From: FirstMegaGame4 <84094287+FirstMegaGame4@users.noreply.github.com>
Date: Tue, 5 Dec 2023 19:38:47 +0100
Subject: [PATCH] Fix MixedArrayList And MixedHashMap

---
 .../mmodding/mmodding_lib/library/utils/MixedArrayList.java    | 3 +++
 .../com/mmodding/mmodding_lib/library/utils/MixedHashMap.java  | 3 +++
 2 files changed, 6 insertions(+)

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
index 7bfa07f..93f3080 100644
--- 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
index 8ac5dbb..1b448e3 100644
--- 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();
 		}