From bbfd352936291f52807ffa5242c4bc39cd86b50a Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Tue, 3 Nov 2015 19:52:04 -0600 Subject: [PATCH] theoretically this should prevent calls to getCellId when we're wanting to spawn objects that aren't in cells --- .../script/theme_park/dungeon/generic_spawner.script | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/theme_park/dungeon/generic_spawner.script b/sku.0/sys.server/compiled/game/script/theme_park/dungeon/generic_spawner.script index 4c2daad31..5ef3a334d 100644 --- a/sku.0/sys.server/compiled/game/script/theme_park/dungeon/generic_spawner.script +++ b/sku.0/sys.server/compiled/game/script/theme_park/dungeon/generic_spawner.script @@ -284,9 +284,14 @@ void spawnCreatures(int x, string datatable, obj_id self ) string planet = myself.area; string spawnRoom = dataTableGetString (datatable, x, "room"); - obj_id room = getCellId (self, spawnRoom); + + if (spawnRoom != "world") { + obj_id room = getCellId (self, spawnRoom); + } else { + obj_id room = obj_id.NULL_ID; + } - if (!isIdValid (room) && (spawnRoom != "world")) + if ((spawnRoom != "world") && !isIdValid (room)) { CustomerServiceLog("bad_spawner_data", "spawner " + self + ", datatable " + datatable + ", row " + x + ", mob " + spawn + ", room " + spawnRoom + " doesn't exist"); removeObjVar (self, SPAWNED + x);