From 92f50b51fa6be1165bd4070603b25b47b3584c25 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 18 Dec 2020 19:06:39 -0600
Subject: [PATCH] Add check for null entity in new data util

---
 scripts/shared/native.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/shared/native.js b/scripts/shared/native.js
index b497da1e..5888d7d0 100644
--- a/scripts/shared/native.js
+++ b/scripts/shared/native.js
@@ -69,10 +69,12 @@ function getEntityData(entity, dataName) {
 // ---------------------------------------------------------------------------
 
 function setEntityData(entity, dataName, dataValue, syncToClients = true) {
-	if(!isNull(server)) {
-		return entity.setData(dataName, dataValue, syncToClients);
-	} else {
-		return entity.setData(dataName, dataValue);
+	if(entity != null) {
+		if(!isNull(server)) {
+			return entity.setData(dataName, dataValue, syncToClients);
+		} else {
+			return entity.setData(dataName, dataValue);
+		}
 	}
 }