From 38635d1d28fc86d74ecd9913a094ef85f5ba8cee Mon Sep 17 00:00:00 2001
From: Cekis <cekisswg@gmail.com>
Date: Tue, 1 Mar 2016 07:46:43 +0100
Subject: [PATCH] Reverted unnecessary changes to the Borvo's Guards spawner. 
 Fixed Celebrity Spawner such that double spawns do not happen when using it
 incorrectly.

---
 .../npc/epic_quest/borvo_guard_spawner.tpf    | 31 +++----------------
 .../npc/celebrity/celebrity_spawner.java      | 28 +----------------
 2 files changed, 6 insertions(+), 53 deletions(-)
 mode change 100644 => 100755 sku.0/sys.server/compiled/game/object/tangible/npc/epic_quest/borvo_guard_spawner.tpf
 mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/npc/celebrity/celebrity_spawner.java

diff --git a/sku.0/sys.server/compiled/game/object/tangible/npc/epic_quest/borvo_guard_spawner.tpf b/sku.0/sys.server/compiled/game/object/tangible/npc/epic_quest/borvo_guard_spawner.tpf
old mode 100644
new mode 100755
index ebf2764f3..4a8a604ea
--- a/sku.0/sys.server/compiled/game/object/tangible/npc/epic_quest/borvo_guard_spawner.tpf
+++ b/sku.0/sys.server/compiled/game/object/tangible/npc/epic_quest/borvo_guard_spawner.tpf
@@ -1,31 +1,10 @@
-//            Filename:     area_spawner.iff
-//            Directory:    object/tangible/ground_spawning
-//
-//            Description:
-//            USED BY EP3 Ground Spawning System
-//
-//            Notes: added 1/28/2005 Cinco Barnes
-//            
-
-@base object/tangible/base/tangible_base.iff
+@base object/tangible/poi/base/poi_base.iff
 
 @class tangible_object_template 0
 
+@class object_template 0
 
+	visibleFlags = [VF_gm]
 
-@class object_template 5
-
-sharedTemplate = "object/tangible/ground_spawning/shared_area_spawner.iff"
-volume = 1
-complexity = 1
-
-tintIndex = 0
-
-invulnerable = true
-
-persistByDefault = false
-
-visibleFlags = [ VF_gm ]
-	
-objvars = [ "spawns" = "borvos_guard"]
-scripts = [ "npc.celebrity.celebrity_spawner"]
+	objvars = [ "spawns" = "borvos_guard"]
+	scripts = [ "npc.celebrity.celebrity_spawner", "npc.celebrity.borvos_guard"]
diff --git a/sku.0/sys.server/compiled/game/script/npc/celebrity/celebrity_spawner.java b/sku.0/sys.server/compiled/game/script/npc/celebrity/celebrity_spawner.java
old mode 100644
new mode 100755
index 80ea7a62d..7cdfd87eb
--- a/sku.0/sys.server/compiled/game/script/npc/celebrity/celebrity_spawner.java
+++ b/sku.0/sys.server/compiled/game/script/npc/celebrity/celebrity_spawner.java
@@ -49,33 +49,7 @@ public class celebrity_spawner extends script.base_script
     }
     public int OnAttach(obj_id self) throws InterruptedException
     {
-        String spawn = getStringObjVar(self, "spawns");
-        location here = getLocation(self);
-        here.y = here.y + 0.5f;
-        obj_id celeb = create.object(spawn, here);
-        setInvulnerable(celeb, true);
-        ai_lib.setDefaultCalmBehavior(celeb, ai_lib.BEHAVIOR_SENTINEL);
-        if (hasObjVar(self, "quest_script"))
-        {
-            String script = getStringObjVar(self, "quest_script");
-            attachScript(celeb, script);
-        }
-        if (hasObjVar(self, "quest_table"))
-        {
-            String table = getStringObjVar(self, "quest_table");
-            setObjVar(celeb, "quest_table", table);
-        }
-        if (hasObjVar(self, "npc_name"))
-        {
-            String name = getStringObjVar(self, "npc_name");
-            if (name != null)
-            {
-                if (!name.equals(""))
-                {
-                    setName(celeb, name);
-                }
-            }
-        }
+        // what the heck?  Removed a bunch of crap that wasn't in the original.  will likely break some spawns due to ignorance.
         return SCRIPT_CONTINUE;
     }
 }