Merge branch 'master' into master

WeaponMechanics · Sep 16, 2024 · a306f13 · a306f13
2 parents a3e2894 + 77958ac
commit a306f13
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/MechanicsCore/src/main/java/me/deecaad/core/mechanics/Mechanics.java b/MechanicsCore/src/main/java/me/deecaad/core/mechanics/Mechanics.java
@@ -104,7 +104,12 @@ public Mechanics serialize(@NotNull SerializeData data) throws SerializerExcepti
         // Store cacheable mechanics into this list to improve performance.
         PlayerEffectMechanicList cacheList = new PlayerEffectMechanicList();
 
-        for (Object obj : list) {
+        for (int i = 0; i < list.size(); i++) {
+            Object obj = list.get(i);
+            if (obj == null) {
+                throw data.listException(null, i, "Found a null/empty mechanic", "This happens when you have an empty line in your list");
+            }
+
             Mechanic mechanic = serializeOne(data, obj.toString());
 
             if (mechanic instanceof PlayerEffectMechanic playerMechanic && playerMechanic.getViewerTargeter() instanceof WorldTargeter worldTargeter) {