Merge pull request #48 from okradonkey/patch-1

Skip mote for pawn on different map
krafs · Apr 22, 2020 · 9f58a57 · 9f58a57
2 parents af851a4 + dd5362a
commit 9f58a57
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/Source/LevelEventMaker.cs b/Source/LevelEventMaker.cs
@@ -36,14 +36,17 @@ public void OnLevelChange(string baseMessage, MessageTypeDef messageType, SkillR
                 var message = new Message(text, messageType, new LookTargets(pawn));
                 Messages.Message(message, false);
 
-                var mote = ThingMaker.MakeThing(moteDef) as Mote;
-                mote.Scale = scale;
-                mote.rotationRate = rotationRate;
-                var position = pawn.DrawPos;
-                mote.Attach(pawn);
-                mote.exactPosition = position;
+                if (pawn.Map == Find.CurrentMap)
+                {
+                    var mote = ThingMaker.MakeThing(moteDef) as Mote;
+                    mote.Scale = scale;
+                    mote.rotationRate = rotationRate;
+                    var position = pawn.DrawPos;
+                    mote.Attach(pawn);
+                    mote.exactPosition = position;
 
-                GenSpawn.Spawn(mote, position.ToIntVec3(), Find.CurrentMap);
+                    GenSpawn.Spawn(mote, position.ToIntVec3(), Find.CurrentMap);
+                }
             }
         }
 
@@ -63,4 +66,4 @@ private string PrepareLevelMessage(string key)
             .Replace("{0}", "{0}".Colorize(ColoredText.NameColor));
         }
     }
-}
+}