From 967841db7a2abdff6b475be2f34f72b5764e93ee Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Mon, 17 Aug 2020 18:06:23 -0500
Subject: [PATCH] fix for trigger::testobjects vector population

---
 Engine/source/T3D/trigger.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Engine/source/T3D/trigger.cpp b/Engine/source/T3D/trigger.cpp
index 98d5f5723..8a88a379c 100644
--- a/Engine/source/T3D/trigger.cpp
+++ b/Engine/source/T3D/trigger.cpp
@@ -394,8 +394,12 @@ bool Trigger::setTickCmd(void *object, const char *index, const char *data)
 void Trigger::testObjects()
 {
    Vector<SceneObject*> foundobjs;
-   gServerContainer.findObjectList(getWorldBox(), 0xFFFFFFFF, &foundobjs);
-   for (S32 i = 0; i < foundobjs.size(); ++i)
+   foundobjs.clear();
+   if (getSceneManager() && getSceneManager()->getContainer() && getSceneManager()->getZoneManager())
+      getSceneManager()->getContainer()->findObjectList(getWorldBox(), 0xFFFFFFFF, &foundobjs);
+   else return;
+
+   for (S32 i = 0; i < foundobjs.size(); i++)
    {
       GameBase* so = dynamic_cast<GameBase*>(foundobjs[i]);
       if (so)