Fix LaunchPad Smoke

GER-Space · May 31, 2019 · cc89196 · cc89196
1 parent 559ed1d
commit cc89196
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/Core/StaticObjects/InstanceUtil.cs b/src/Core/StaticObjects/InstanceUtil.cs
@@ -33,6 +33,7 @@ internal static class InstanceUtil
         /// <returns></returns>
 		internal static StaticInstance GetStaticInstanceForGameObject(GameObject gameObject)
         {
+            Log.UserWarning("Depricated call");
             List<StaticInstance> objList = (from obj in StaticDatabase.allStaticInstances where obj.gameObject == gameObject select obj).ToList();
 
             if (objList.Count >= 1)

diff --git a/src/Core/StaticObjects/StaticInstance.cs b/src/Core/StaticObjects/StaticInstance.cs
@@ -290,7 +290,7 @@ private void Spawn()
                     staticModules.Add(moduleKey, moduleType);
                 }
 
-                StaticModule mod = gameObject.AddComponent(moduleType) as StaticModule;
+                StaticModule mod = mesh.AddComponent(moduleType) as StaticModule;
 
                 if (mod != null)
                 {

diff --git a/src/Core/StaticObjects/StaticModules/PadSmoke/PadSmoke.cs b/src/Core/StaticObjects/StaticModules/PadSmoke/PadSmoke.cs
@@ -23,6 +23,7 @@ public class PadSmoke : StaticModule
 
         public void Start()
         {
+            //Log.Normal("PadSmoke Start");
             baseObject = gameObject;
             emitterTransforms = smokeEmittersNames.Split(seperators, StringSplitOptions.RemoveEmptyEntries).ToList();
 
@@ -32,8 +33,9 @@ public void Start()
             if (receiverCollider != null)
             {
                 receiverCollider.tag = "LaunchpadFX";
+                //Log.Normal("Collider Tag: " + receiverCollider.tag);
                 receiverCollider.gameObject.layer = 15;
-                KKPadFX padfx = receiverCollider.gameObject.AddComponent<KKPadFX>();
+                KKPadFX padfx = receiverCollider.gameObject.AddOrGetComponent<KKPadFX>();
                 padfx.Setup(emitterTransforms, gameObject);
             }
             else