Ignore NPCs

EverestAPI · Mar 19, 2018 · 0bb77a0 · 0bb77a0
1 parent a9a9940
commit 0bb77a0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/RainbowMod/RainbowModule.cs b/RainbowMod/RainbowModule.cs
@@ -99,13 +99,13 @@ public override void CreateModMenuSection(TextMenu menu, bool inGame, EventInsta
 
         public static object GetHairColor(HM hook, HM.OriginalMethod origM, HM.Parameters args) {
             // C# 7:
-            var (self, index) = args.As<PlayerHair, int>();
+            // var (self, index) = args.As<PlayerHair, int>();
             // C# 6:
-            // PlayerHair self = (PlayerHair) args.RawParams[0];
-            // int index = (int) args.RawParams[1];
+            PlayerHair self = (PlayerHair) args.RawParams[0];
+            int index = (int) args.RawParams[1];
 
             Color colorOrig = origM.As<Color>(args.RawParams);
-            if (Settings.Mode == RainbowModMode.Off || self.GetSprite().Mode == PlayerSpriteMode.Badeline)
+            if (Settings.Mode == RainbowModMode.Off || !(self.Entity is Player) || self.GetSprite().Mode == PlayerSpriteMode.Badeline)
                 return colorOrig;
 
             Color color = colorOrig;
@@ -149,10 +149,10 @@ public static object GetHairColor(HM hook, HM.OriginalMethod origM, HM.Parameter
 
         public static object GetTrailColor(HM hook, HM.OriginalMethod origM, HM.Parameters args) {
             // C# 7:
-            var (self, wasDashB) = args.As<Player, bool>();
+            // var (self, wasDashB) = args.As<Player, bool>();
             // C# 6:
-            // Player self = (Player) args.RawParams[0];
-            // bool wasDashB = (bool) args.RawParams[1];
+            Player self = (Player) args.RawParams[0];
+            bool wasDashB = (bool) args.RawParams[1];
 
             if ((Settings.Mode & RainbowModMode.Rainbow) != RainbowModMode.Rainbow || self.Sprite.Mode == PlayerSpriteMode.Badeline || self.Hair == null)
                 return origM.As<Color>(args.RawParams);
@@ -162,13 +162,13 @@ public static object GetTrailColor(HM hook, HM.OriginalMethod origM, HM.Paramete
 
         public static MTexture GetHairTexture(HM hook, HM.OriginalMethod origM, HM.Parameters args) {
             // C# 7:
-            var (self, index) = args.As<PlayerHair, int>();
+            // var (self, index) = args.As<PlayerHair, int>();
             // C# 6:
-            // PlayerHair self = (PlayerHair) args.RawParams[0];
-            // int index = (int) args.RawParams[1];
+            PlayerHair self = (PlayerHair) args.RawParams[0];
+            int index = (int) args.RawParams[1];
 
             MTexture orig = origM.As<MTexture>(args.RawParams);
-            if ((Settings.Mode & RainbowModMode.Fox) != RainbowModMode.Fox || self.GetSprite().Mode == PlayerSpriteMode.Badeline)
+            if ((Settings.Mode & RainbowModMode.Fox) != RainbowModMode.Fox || !(self.Entity is Player) || self.GetSprite().Mode == PlayerSpriteMode.Badeline)
                 return orig;
 
             if (index == 0)

diff --git a/RainbowMod/metadata.yaml b/RainbowMod/metadata.yaml
@@ -1,5 +1,5 @@
 Name: RainbowMod
-Version: 2.2.0
+Version: 2.3.0
 DLL: RainbowMod.dll
 Dependencies:
   - Name: Everest