Remove debug code

ShimmyMySherbet · ShimmyMySherbet · commit a104ea7b9eb3 · 2020-07-16T20:48:24.000+10:00
diff --git a/ShimmysAdminTools/Commands/MuteCommand.cs b/ShimmysAdminTools/Commands/MuteCommand.cs
@@ -39,7 +39,6 @@ public void Execute(IRocketPlayer caller, string[] command)
                             if (command.Length > 1)
                             {
                                 TimeSpan MuteTS = Helpers.GetTimespanFromString(command[1]);
-                                Console.WriteLine($"Mute Dur: {MuteTS.TotalSeconds}");
                                 UnturnedChat.Say(caller, "Mute_PlayerMuted_Time".Translate(Helpers.GetTimeFromTimespan(MuteTS)));
                                 playerData.MuteExpires = DateTime.Now.Add(MuteTS);
                                 playerData.MuteIsTemp = true;
diff --git a/ShimmysAdminTools/Components/Helpers.cs b/ShimmysAdminTools/Components/Helpers.cs
@@ -107,7 +107,6 @@ public static TimeSpan GetTimespanFromString(string dur)
         {
             double numst = GetNumericStart(dur);
             string tmod = GetTimeModifier(dur);
-            Console.WriteLine($"t: {numst}, m: {tmod}");
             return GetTimespanFromDetails(numst, tmod);
         }
         public static string GetTimeFromTimespan(TimeSpan ts)
diff --git a/ShimmysAdminTools/Models/MapJumpingSession.cs b/ShimmysAdminTools/Models/MapJumpingSession.cs
@@ -48,18 +48,12 @@ private void FixedUpdate()
                     if (Player.Player.quests.markerPosition != LastPos)
                     {
                         LastPos = Player.Player.quests.markerPosition;
-                        System.Console.WriteLine("try marker tp");
                         RaycastResult Raycast = RaycastUtility.Raycast(new Vector3(LastPos.x, 1024, LastPos.z), Vector3.down, RayMasks.GROUND | RayMasks.GROUND2 | RayMasks.STRUCTURE | RayMasks.ENVIRONMENT | RayMasks.LARGE
                             | RayMasks.MEDIUM | RayMasks.SMALL | RayMasks.RESOURCE | RayMasks.BARRICADE, 1024);
                         if (Raycast.RaycastHit)
                         {
-                            System.Console.WriteLine($"try tp");
                             Player.Teleport(new Vector3(Raycast.Raycast.point.x, Raycast.Raycast.point.y + 1, Raycast.Raycast.point.z), Player.Rotation);
-                            System.Console.WriteLine("tped");
-                        } else
-                        {
-                            System.Console.WriteLine($"did not hit!");
-                        }
+                        } 
                     }
                 }
             }
diff --git a/ShimmysAdminTools/Models/PlayerSession.cs b/ShimmysAdminTools/Models/PlayerSession.cs
@@ -25,16 +25,11 @@ public void StartMapJumpingSession()
         {
             if (MapJumpingSession == null)
             {
-                Console.WriteLine("Create Jump Session");
                 MapJumpingSession = new GameObject("MapJumpingSession");
                 UnityEngine.Object.DontDestroyOnLoad(MapJumpingSession);
                 MapJumpingSession.AddComponent<MapJumpingSession>();
                 UnturnedPlayer pl = UnturnedPlayer.FromCSteamID(new Steamworks.CSteamID(Player));
-                Console.WriteLine($"create {pl.DisplayName}");
                 GameObjectExtension.getOrAddComponent<MapJumpingSession>(MapJumpingSession).SetPlayer(pl);
-                //MapJumpingSession = new GameObject("MapJumpingSession");
-                //UnityEngine.Object.DontDestroyOnLoad(MapJumpingSession);
-                //MapJumpingSession.AddComponent<MapJumpingSession>().SetPlayer(UnturnedPlayer.FromCSteamID(new Steamworks.CSteamID(Player)));
             }
         }
 
diff --git a/ShimmysAdminTools/Modules/PointToolManager.cs b/ShimmysAdminTools/Modules/PointToolManager.cs
@@ -196,25 +196,25 @@ public static void RunJumpTool(UnturnedPlayer Player, RaycastResult Raycast, Unt
 
                 if (RunMode == 0)
                 {
-                    Player.Teleport(new Vector3(Raycast.Raycast.point.x, Raycast.Raycast.point.y + 0.5f, Raycast.Raycast.point.z), Player.Rotation);
+                    Player.Player.teleportToLocationUnsafe(Raycast.Raycast.point, Player.Rotation);
                 }
                 else if (RunMode == 1)
                 {
                     if (Raycast.Raycast.distance < 300)
                     {
                         Vector3 Target = new Vector3(Raycast.Raycast.point.x, Raycast.Raycast.point.y + (float)1.75, Raycast.Raycast.point.z);
-                        Player.Teleport(Target, Player.Rotation);
+                        Player.Player.teleportToLocationUnsafe(Target, Player.Rotation);
                     }
                     else
                     {
-                        Player.Teleport(new Vector3(Raycast.Raycast.point.x, Raycast.Raycast.point.y + 0.5f, Raycast.Raycast.point.z), Player.Rotation);
+                        Player.Player.teleportToLocationUnsafe(Raycast.Raycast.point, Player.Rotation);
                     }
                 }
                 else if (RunMode == 2)
                 {
                     if (Raycast.Raycast.distance > 300)
                     {
-                        Player.Teleport(new Vector3(Raycast.Raycast.point.x, Raycast.Raycast.point.y + 0.5f, Raycast.Raycast.point.z), Player.Rotation);
+                        Player.Player.teleportToLocationUnsafe(Raycast.Raycast.point, Player.Rotation);
                     }
                     else
                     {
@@ -242,7 +242,7 @@ public static void RunJumpTool(UnturnedPlayer Player, RaycastResult Raycast, Unt
 
                         if (DownCast.RaycastHit && DownCast.Raycast.distance != 0 && DownCast.Raycast.distance < DistanceToGround)
                         {
-                            Player.Teleport(new Vector3(DownCast.Raycast.point.x, DownCast.Raycast.point.y + 0.5f, DownCast.Raycast.point.z), Player.Rotation);
+                            Player.Player.teleportToLocationUnsafe(new Vector3(DownCast.Raycast.point.x, DownCast.Raycast.point.y + 0.2f, DownCast.Raycast.point.z), Player.Rotation);
                         }
                         else
                         {
@@ -266,19 +266,19 @@ public static void RunJumpTool(UnturnedPlayer Player, RaycastResult Raycast, Unt
 
                 if (Placing.Count() != 0)
                 {
-                    Player.Teleport(new Vector3(Placing[0].x, Placing[0].y + 0.5f, Placing[0].z), Player.Rotation);
+                    Player.Player.teleportToLocationUnsafe(new Vector3(Placing[0].x, Placing[0].y + 0.5f, Placing[0].z), Player.Rotation);
                 }
                 else
                 {
-                    Player.Teleport(new Vector3(TargetPos.x, TargetPos.y + 0.5f, TargetPos.z), Player.Rotation);
+                    Player.Player.teleportToLocationUnsafe(new Vector3(TargetPos.x, TargetPos.y + 0.5f, TargetPos.z), Player.Rotation);
                 }
             }
             else if (gesture == UnturnedPlayerEvents.PlayerGesture.Point)
             {
                 Vector3 TargetPos = Raycast.Raycast.point;
                 Vector3 CurrentPos = Player.Position;
                 Vector3 ResultPos = Vector3.MoveTowards(TargetPos, CurrentPos, 1);
-                Player.Teleport(new Vector3(ResultPos.x, ResultPos.y + 0.5f, ResultPos.z), Player.Rotation);
+                Player.Player.teleportToLocationUnsafe(new Vector3(ResultPos.x, ResultPos.y + 0.5f, ResultPos.z), Player.Rotation);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ public void Execute(IRocketPlayer caller, string[] command)`
`39`	`39`	`if (command.Length > 1)`
`40`	`40`	`{`
`41`	`41`	`TimeSpan MuteTS = Helpers.GetTimespanFromString(command[1]);`
`42`		`- Console.WriteLine($"Mute Dur: {MuteTS.TotalSeconds}");`
`43`	`42`	`UnturnedChat.Say(caller, "Mute_PlayerMuted_Time".Translate(Helpers.GetTimeFromTimespan(MuteTS)));`
`44`	`43`	`playerData.MuteExpires = DateTime.Now.Add(MuteTS);`
`45`	`44`	`playerData.MuteIsTemp = true;`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,6 @@ public static TimeSpan GetTimespanFromString(string dur)`
`107`	`107`	`{`
`108`	`108`	`double numst = GetNumericStart(dur);`
`109`	`109`	`string tmod = GetTimeModifier(dur);`
`110`		`- Console.WriteLine($"t: {numst}, m: {tmod}");`
`111`	`110`	`return GetTimespanFromDetails(numst, tmod);`
`112`	`111`	`}`
`113`	`112`	`public static string GetTimeFromTimespan(TimeSpan ts)`
Original file line number	Diff line number	Diff line change
`@@ -48,18 +48,12 @@ private void FixedUpdate()`
`48`	`48`	`if (Player.Player.quests.markerPosition != LastPos)`
`49`	`49`	`{`
`50`	`50`	`LastPos = Player.Player.quests.markerPosition;`
`51`		`- System.Console.WriteLine("try marker tp");`
`52`	`51`	`RaycastResult Raycast = RaycastUtility.Raycast(new Vector3(LastPos.x, 1024, LastPos.z), Vector3.down, RayMasks.GROUND \| RayMasks.GROUND2 \| RayMasks.STRUCTURE \| RayMasks.ENVIRONMENT \| RayMasks.LARGE`
`53`	`52`	`\| RayMasks.MEDIUM \| RayMasks.SMALL \| RayMasks.RESOURCE \| RayMasks.BARRICADE, 1024);`
`54`	`53`	`if (Raycast.RaycastHit)`
`55`	`54`	`{`
`56`		`- System.Console.WriteLine($"try tp");`
`57`	`55`	`Player.Teleport(new Vector3(Raycast.Raycast.point.x, Raycast.Raycast.point.y + 1, Raycast.Raycast.point.z), Player.Rotation);`
`58`		`- System.Console.WriteLine("tped");`
`59`		`- } else`
`60`		`- {`
`61`		`- System.Console.WriteLine($"did not hit!");`
`62`		`- }`
	`56`	`+ }`
`63`	`57`	`}`
`64`	`58`	`}`
`65`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,16 +25,11 @@ public void StartMapJumpingSession()`
`25`	`25`	`{`
`26`	`26`	`if (MapJumpingSession == null)`
`27`	`27`	`{`
`28`		`- Console.WriteLine("Create Jump Session");`
`29`	`28`	`MapJumpingSession = new GameObject("MapJumpingSession");`
`30`	`29`	`UnityEngine.Object.DontDestroyOnLoad(MapJumpingSession);`
`31`	`30`	`MapJumpingSession.AddComponent<MapJumpingSession>();`
`32`	`31`	`UnturnedPlayer pl = UnturnedPlayer.FromCSteamID(new Steamworks.CSteamID(Player));`
`33`		`- Console.WriteLine($"create {pl.DisplayName}");`
`34`	`32`	`GameObjectExtension.getOrAddComponent<MapJumpingSession>(MapJumpingSession).SetPlayer(pl);`
`35`		`- //MapJumpingSession = new GameObject("MapJumpingSession");`
`36`		`- //UnityEngine.Object.DontDestroyOnLoad(MapJumpingSession);`
`37`		`- //MapJumpingSession.AddComponent<MapJumpingSession>().SetPlayer(UnturnedPlayer.FromCSteamID(new Steamworks.CSteamID(Player)));`
`38`	`33`	`}`
`39`	`34`	`}`
`40`	`35`
Original file line number	Diff line number	Diff line change
`@@ -196,25 +196,25 @@ public static void RunJumpTool(UnturnedPlayer Player, RaycastResult Raycast, Unt`
`196`	`196`
`197`	`197`	`if (RunMode == 0)`
`198`	`198`	`{`
`199`		`- Player.Teleport(new Vector3(Raycast.Raycast.point.x, Raycast.Raycast.point.y + 0.5f, Raycast.Raycast.point.z), Player.Rotation);`
	`199`	`+ Player.Player.teleportToLocationUnsafe(Raycast.Raycast.point, Player.Rotation);`
`200`	`200`	`}`
`201`	`201`	`else if (RunMode == 1)`
`202`	`202`	`{`
`203`	`203`	`if (Raycast.Raycast.distance < 300)`
`204`	`204`	`{`
`205`	`205`	`Vector3 Target = new Vector3(Raycast.Raycast.point.x, Raycast.Raycast.point.y + (float)1.75, Raycast.Raycast.point.z);`
`206`		`- Player.Teleport(Target, Player.Rotation);`
	`206`	`+ Player.Player.teleportToLocationUnsafe(Target, Player.Rotation);`
`207`	`207`	`}`
`208`	`208`	`else`
`209`	`209`	`{`
`210`		`- Player.Teleport(new Vector3(Raycast.Raycast.point.x, Raycast.Raycast.point.y + 0.5f, Raycast.Raycast.point.z), Player.Rotation);`
	`210`	`+ Player.Player.teleportToLocationUnsafe(Raycast.Raycast.point, Player.Rotation);`
`211`	`211`	`}`
`212`	`212`	`}`
`213`	`213`	`else if (RunMode == 2)`
`214`	`214`	`{`
`215`	`215`	`if (Raycast.Raycast.distance > 300)`
`216`	`216`	`{`
`217`		`- Player.Teleport(new Vector3(Raycast.Raycast.point.x, Raycast.Raycast.point.y + 0.5f, Raycast.Raycast.point.z), Player.Rotation);`
	`217`	`+ Player.Player.teleportToLocationUnsafe(Raycast.Raycast.point, Player.Rotation);`
`218`	`218`	`}`
`219`	`219`	`else`
`220`	`220`	`{`
`@@ -242,7 +242,7 @@ public static void RunJumpTool(UnturnedPlayer Player, RaycastResult Raycast, Unt`
`242`	`242`
`243`	`243`	`if (DownCast.RaycastHit && DownCast.Raycast.distance != 0 && DownCast.Raycast.distance < DistanceToGround)`
`244`	`244`	`{`
`245`		`- Player.Teleport(new Vector3(DownCast.Raycast.point.x, DownCast.Raycast.point.y + 0.5f, DownCast.Raycast.point.z), Player.Rotation);`
	`245`	`+ Player.Player.teleportToLocationUnsafe(new Vector3(DownCast.Raycast.point.x, DownCast.Raycast.point.y + 0.2f, DownCast.Raycast.point.z), Player.Rotation);`
`246`	`246`	`}`
`247`	`247`	`else`
`248`	`248`	`{`
`@@ -266,19 +266,19 @@ public static void RunJumpTool(UnturnedPlayer Player, RaycastResult Raycast, Unt`
`266`	`266`
`267`	`267`	`if (Placing.Count() != 0)`
`268`	`268`	`{`
`269`		`- Player.Teleport(new Vector3(Placing[0].x, Placing[0].y + 0.5f, Placing[0].z), Player.Rotation);`
	`269`	`+ Player.Player.teleportToLocationUnsafe(new Vector3(Placing[0].x, Placing[0].y + 0.5f, Placing[0].z), Player.Rotation);`
`270`	`270`	`}`
`271`	`271`	`else`
`272`	`272`	`{`
`273`		`- Player.Teleport(new Vector3(TargetPos.x, TargetPos.y + 0.5f, TargetPos.z), Player.Rotation);`
	`273`	`+ Player.Player.teleportToLocationUnsafe(new Vector3(TargetPos.x, TargetPos.y + 0.5f, TargetPos.z), Player.Rotation);`
`274`	`274`	`}`
`275`	`275`	`}`
`276`	`276`	`else if (gesture == UnturnedPlayerEvents.PlayerGesture.Point)`
`277`	`277`	`{`
`278`	`278`	`Vector3 TargetPos = Raycast.Raycast.point;`
`279`	`279`	`Vector3 CurrentPos = Player.Position;`
`280`	`280`	`Vector3 ResultPos = Vector3.MoveTowards(TargetPos, CurrentPos, 1);`
`281`		`- Player.Teleport(new Vector3(ResultPos.x, ResultPos.y + 0.5f, ResultPos.z), Player.Rotation);`
	`281`	`+ Player.Player.teleportToLocationUnsafe(new Vector3(ResultPos.x, ResultPos.y + 0.5f, ResultPos.z), Player.Rotation);`
`282`	`282`	`}`
`283`	`283`	`}`
`284`	`284`