Revert "I think I added something, I think"

This reverts commit a9bb907.
PatPeter · Dec 18, 2020 · 6e631ae · 6e631ae
1 parent 04cddf2
commit 6e631ae
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 62 deletions.
diff --git a/ZombieSuicideHotline/Config.cs b/ZombieSuicideHotline/Config.cs
@@ -1,7 +1,6 @@
 using System.ComponentModel;
 using Exiled.API.Interfaces;
 using System.Collections.Generic;
-using UnityEngine;
 
 namespace ZombieSuicideHotline
 {
@@ -40,28 +39,5 @@ public class Config : IConfig {
 				"Scp93989", -1f
 			},
 		};
-
-		[Description("A list of classes that should go back to there spawn if there are no valid SCPs to go to")]
-		public Dictionary<string, Vector3> Gobacktospawn { get; set; } = new Dictionary<string, Vector3>
-		{
-			{
-				"Scp049", new Vector3(0.0f, 1.0f, 0.0f)
-			},
-			{
-				"Scp096", new Vector3(0.0f, 1.0f, 0.0f)
-			},
-			{
-				"Scp106", new Vector3(0.0f, 1.0f, 0.0f)
-			},
-			{
-				"Scp173", new Vector3(0.0f, 1.0f, 0.0f)
-			},
-			{
-				"Scp93953", new Vector3(0.0f, 1.0f, 0.0f)
-			},
-			{
-				"Scp93989", new Vector3(0.0f, 1.0f, 0.0f)
-			},
-		};
-	}
+    }
 }
diff --git a/ZombieSuicideHotline/PlayerHandlers.cs b/ZombieSuicideHotline/PlayerHandlers.cs
@@ -3,7 +3,6 @@
     using Exiled.Events.EventArgs;
     using Player = Exiled.API.Features.Player;
     using Exiled.API.Features;
-    using UnityEngine;
 
     public class PlayerHandlers
     {
@@ -25,7 +24,6 @@ public void OnRoundEnd()
                 if (this.plugin.zombies.ContainsKey(player.UserId))
                 {
                     this.plugin.zombies[player.UserId].Disconnected = false;
-                    this.plugin.zombies[player.UserId].LastDeath = 0f;
                 }
             }
         }
@@ -53,10 +51,6 @@ public void OnPlayerSpawn(SpawningEventArgs ev)
                     ev.Position = targetPlayer.Position;
                 }
             }
-            if (Plugin.Singleton.Config.Gobacktospawn.ContainsKey(player.Role.ToString()))
-            {
-                Plugin.Singleton.Config.Gobacktospawn[player.Role.ToString()] = player.Position;
-            }
             if (ev.RoleType == RoleType.Scp049)
             {
                 player.Broadcast(10, "Use .recall to bring all your zombies to you");
@@ -74,10 +68,6 @@ public void OnPlayerDied(DiedEventArgs ev)
             {
                     plugin.zombies[player.UserId].Disconnected = false;
             }
-            if (ev.Killer.Role == RoleType.Scp049)
-            {
-                plugin.zombies[player.UserId].LastDeath = Time.time;
-            }
         }
 
         public void OnPlayerHurt(HurtingEventArgs ev)
@@ -92,14 +82,6 @@ public void OnPlayerHurt(HurtingEventArgs ev)
                         ev.Amount = (ev.Target.Health * plugin.Config.HotlineCalls[ev.Target.Role.ToString()]);
                         ev.Target.Position = targetPlayer.Position;
                     }
-                    if (Plugin.Singleton.Config.Gobacktospawn.ContainsKey(ev.Target.Role.ToString()))
-                    {
-                        ev.Target.Position = Plugin.Singleton.Config.Gobacktospawn[ev.Target.Role.ToString()];
-                    }
-                    if (ev.Target.Role == RoleType.Scp0492)
-                    {
-                        ev.Target.Position = Plugin.Singleton.Config.Gobacktospawn["Scp049"];
-                    }
                 } 
             }
         }
@@ -110,10 +92,6 @@ public void OnPlayerLeft(LeftEventArgs ev)
             {
                 plugin.zombies[ev.Player.UserId].Disconnected = true;
             }
-            if (this.plugin.zombies[ev.Player.UserId].LastDeath + 10 <Time.time)
-            {
-                plugin.zombies[ev.Player.UserId].Disconnected = true;
-            }
         }
 
         public Player GetTeleportTarget(Player sourcePlayer)
@@ -131,12 +109,9 @@ public Player GetTeleportTarget(Player sourcePlayer)
                     continue;
                 }
 
-                if (player.Role != RoleType.Scp0492 || player.Role != RoleType.Scp173)
+                if (targetPlayer == null)
                 {
-                    if (player.Role == RoleType.Scp106)
-                    {
-                        continue;
-                    }
+                    targetPlayer = player;
                 }
 
                 if (player.Team == Team.SCP)

diff --git a/ZombieSuicideHotline/Plugin.cs b/ZombieSuicideHotline/Plugin.cs
@@ -57,7 +57,7 @@ public class Zombie
         public string Name;
         public string SteamId;
         public string IpAddress;
-        public float LastDeath = 0f;
+        public int LastRecall = 0;
         public bool Undead = false;
         public bool Disconnected = false;
         //public Dictionary<string, Zombie> Zombies = new Dictionary<string, Zombie>();
@@ -73,7 +73,7 @@ public Zombie(int playerId, string name, string steamId, string ipAddress)
 
         public override string ToString()
         {
-            return "[ PlayerId: " + PlayerId + ", Name: " + Name + ", SteamID: " + SteamId + ", IpAddress: " + IpAddress + ", LastRecall: " + LastDeath + ", Undead: " + Undead + ", Disconnected: " + Disconnected + " ]";
+            return "[ PlayerId: " + PlayerId + ", Name: " + Name + ", SteamID: " + SteamId + ", IpAddress: " + IpAddress + ", LastRecall: " + LastRecall + ", Undead: " + Undead + ", Disconnected: " + Disconnected + " ]";
         }
     }
 }
diff --git a/ZombieSuicideHotline/RetreatCommand.cs b/ZombieSuicideHotline/RetreatCommand.cs
@@ -13,7 +13,7 @@ namespace ZombieSuicideHotline
     [CommandHandler(typeof(ClientCommandHandler))]
     class RetreatCommand : ICommand
     {
-        public string Command => "retreat";
+        public string Command => "retreat"; //Why is this called respawn?
 
         public string[] Aliases => null;
 
@@ -80,13 +80,6 @@ public Player GetTeleportTarget(Player sourcePlayer)
                     break;
                 }
             }
-            if (targetPlayer == null)
-            {
-                if (Plugin.Singleton.Config.Gobacktospawn.ContainsKey(sourcePlayer.Role.ToString()))
-                {
-                    sourcePlayer.Position = Plugin.Singleton.Config.Gobacktospawn[sourcePlayer.Role.ToString()];
-                }
-            }
             return targetPlayer;
         }
     }