From 84b7fc083145b31d39e2281a599b166c84d6d21d Mon Sep 17 00:00:00 2001
From: Leonardo Jeanteur <leonardo@shirogames.com>
Date: Fri, 3 Apr 2026 15:57:30 +0200
Subject: [PATCH] Add null check on Weak.resolve

---
 hxbit/NetworkHost.hx | 10 +++++++---
 hxbit/Weak.hx        |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/hxbit/NetworkHost.hx b/hxbit/NetworkHost.hx
index beaf637..70a1250 100644
--- a/hxbit/NetworkHost.hx
+++ b/hxbit/NetworkHost.hx
@@ -1196,6 +1196,9 @@ class NetworkHost {
 		}
 		var o = markHead;
 		while( o != null ) {
+			var next = o.__next;
+			o.__next = null;
+			if( markHead == o ) markHead = null;
 			if( (o.__bits1|o.__bits2 #if hxbit_visibility | o.__dirtyVisibilityGroups #end) != 0 ) {
 				if( logger != null ) {
 					var props = [];
@@ -1269,9 +1272,10 @@ class NetworkHost {
 				o.__dirtyVisibilityGroups = 0;
 				#end
 			}
-			var n = o.__next;
-			o.__next = null;
-			o = n;
+			o = next;
+			// var n = o.__next;
+			// o.__next = null;
+			// o = n;
 		}
 		markHead = null;
 	}
diff --git a/hxbit/Weak.hx b/hxbit/Weak.hx
index ddba351..62bf471 100644
--- a/hxbit/Weak.hx
+++ b/hxbit/Weak.hx
@@ -10,6 +10,8 @@ abstract Weak<T:NetworkSerializable>(UID) {
     }
 	static function resolve( uid : UID ) : Dynamic {
 		var host = NetworkHost.current;
+		if (host == null)
+			return null;
 		var r = @:privateAccess host.globalCtx.refs.get(uid);
 		if( r == null ) {
 			var h = @:privateAccess host.registerHead;