From 85778080362a6d8e97f0521a77ff421eb3f50af8 Mon Sep 17 00:00:00 2001
From: "Alex \"mcmonkey\" Goodwin" <git_commits@alexgoodwin.dev>
Date: Wed, 6 Apr 2022 18:19:23 -0700
Subject: [PATCH] null check and meta tweak

---
 .../java/com/denizenscript/denizen/objects/PlayerTag.java     | 1 +
 .../denizen/nms/v1_18/helpers/EntityHelperImpl.java           | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
index c7521cdebf..67ae605f1d 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
@@ -3873,6 +3873,7 @@ else if (bal > goal) {
         // @plugin BungeeCord
         // @description
         // Sends the player to the specified Bungee server.
+        // This also works with other Bungee-Messaging compatible proxy systems, such as Velocity.
         // -->
         if (mechanism.matches("send_to") && mechanism.hasValue()) {
             if (!isOnline()) {
diff --git a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/EntityHelperImpl.java b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/EntityHelperImpl.java
index 2b7d949902..9d8c34b23b 100644
--- a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/EntityHelperImpl.java
+++ b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/EntityHelperImpl.java
@@ -847,7 +847,9 @@ public void setTrackingRange(Entity entity, int range) {
         try {
             ChunkMap map = ((CraftWorld) entity.getWorld()).getHandle().getChunkSource().chunkMap;
             ChunkMap.TrackedEntity entry = map.entityMap.get(entity.getEntityId());
-            TRACKING_RANGE_SETTER.invoke(entry, range);
+            if (entry != null) {
+                TRACKING_RANGE_SETTER.invoke(entry, range);
+            }
         }
         catch (Throwable ex) {
             Debug.echoError(ex);