From 39f8d0ee7e4d9fe19b10a44029e1e88739133a90 Mon Sep 17 00:00:00 2001
From: Xvareon <91329439+Xvareon@users.noreply.github.com>
Date: Tue, 5 May 2026 17:30:20 +0800
Subject: [PATCH] fix: Fixed NPE crash for isAllied() function, causing world
 deadlocks (#906)

---
 .../java/electroblob/wizardry/util/AllyDesignationSystem.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/electroblob/wizardry/util/AllyDesignationSystem.java b/src/main/java/electroblob/wizardry/util/AllyDesignationSystem.java
index afff556f..88cf2678 100644
--- a/src/main/java/electroblob/wizardry/util/AllyDesignationSystem.java
+++ b/src/main/java/electroblob/wizardry/util/AllyDesignationSystem.java
@@ -206,6 +206,10 @@ public final class AllyDesignationSystem {
 	 * generally used to determine targets for healing or other group buffs. */
 	public static boolean isAllied(EntityLivingBase allyOf, EntityLivingBase possibleAlly){
 
+        if (allyOf == null || possibleAlly == null) {
+            return false;
+        }
+
 		// Owned entities inherit their owner's allies
 		if(allyOf instanceof IEntityOwnable){
 			Entity owner = ((IEntityOwnable)allyOf).getOwner();