Updated to 2.6.6

UserR00T · UserR00T · commit c21a54cf879b · 2019-04-23T21:07:18.000+02:00
diff --git a/source/BP-Essentials/BP-Essentials.csproj b/source/BP-Essentials/BP-Essentials.csproj
@@ -85,7 +85,7 @@
     <Compile Include="Chat\Commands\Admin\TpLocation.cs" />
     <Compile Include="Chat\Commands\Admin\TpToApartment.cs" />
     <Compile Include="Chat\Commands\Admin\Wipe.cs" />
-    <Compile Include="Chat\Commands\Admin\_SetJob.cs" />
+    <Compile Include="Chat\Commands\Admin\SetJob.cs" />
     <Compile Include="Chat\Commands\Admin\Slap.cs" />
     <Compile Include="Chat\Commands\Admin\Strip.cs" />
     <Compile Include="Chat\Commands\Everyone\Afk.cs" />
@@ -119,6 +119,7 @@
     <Compile Include="HookChat.cs" />
     <Compile Include="Core.cs" />
     <Compile Include="HookMethods.cs" />
+    <Compile Include="Methods\FileHandler\Translations.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Variables.cs" />
     <Compile Include="ExtensionMethods.cs" />
diff --git a/source/BP-Essentials/Chat/Commands/Admin/Ban.cs b/source/BP-Essentials/Chat/Commands/Admin/Ban.cs
@@ -1,7 +1,8 @@
 ﻿using System;
 using static BP_Essentials.Variables;
-namespace BP_Essentials.Commands {
-    public class Ban
+namespace BP_Essentials.Commands
+{
+    class Ban
     {
         public static void Run(SvPlayer player, string message)
         {
diff --git a/source/BP-Essentials/Chat/Commands/Admin/Clear.cs b/source/BP-Essentials/Chat/Commands/Admin/Clear.cs
@@ -23,7 +23,7 @@ public static void Run(SvPlayer player, string message)
             foreach (var item in shPlayer.myItems.Values)
                 tempList.Add(item);
             for (int i = 0; i < tempList.Count; i++)
-                shPlayer.TransferItem(2, tempList[i].item.index, shPlayer.MyItemCount(tempList[i].item.index), true);
+                shPlayer.TransferItem(DeltaInv.RemoveFromMe, tempList[i].item.index, shPlayer.MyItemCount(tempList[i].item.index), true);
             player.SendChatMessage($"<color={infoColor}>You cleared the inventory of</color> <color={argColor}>{shPlayer.username}</color><color={infoColor}>.</color>");
             shPlayer.svPlayer.SendChatMessage($"<color={warningColor}>Your inventory has been cleared by</color> <color={argColor}>{player.playerData.username}</color><color={warningColor}>.</color>");
         }
diff --git a/source/BP-Essentials/Chat/Commands/Admin/SetJob.cs b/source/BP-Essentials/Chat/Commands/Admin/SetJob.cs
@@ -9,7 +9,7 @@
 
 namespace BP_Essentials.Commands
 {
-    class Setjob : SvPlayer
+    class SetJob : SvPlayer
     {
         public static void Run(SvPlayer player, string message)
         {
@@ -46,7 +46,7 @@ public static void Run(SvPlayer player, string message)
                 return;
             }
             player.SendChatMessage(string.Format(msg, currPlayer.username, Jobs[arg1Parsed]));
-            player.SvSetJob(player.player.jobs[arg1Parsed], true, false);
+            currPlayer.svPlayer.SvSetJob(player.player.jobs[arg1Parsed], true, false);
         }
     }
 }
diff --git a/source/BP-Essentials/Chat/Commands/Admin/TpAll.cs b/source/BP-Essentials/Chat/Commands/Admin/TpAll.cs
@@ -10,8 +10,9 @@ public static void Run(SvPlayer player, string message)
         {
             var pos = player.player.GetPosition();
             var rot = player.player.GetRotation();
+            var placeIndex = player.player.GetPlaceIndex();
             foreach (var currPlayer in SvMan.players.Values)
-                currPlayer.svPlayer.ResetAndSavePosition(pos, rot, player.player.GetPlaceIndex());
+                currPlayer.svPlayer.ResetAndSavePosition(pos, rot, placeIndex);
             player.SendChatMessage($"<color={infoColor}>Teleported</color> <color={argColor}>everyone</color> <color={infoColor}>to your location.</color>");
         }
     }
diff --git a/source/BP-Essentials/Chat/Commands/Admin/TpHere.cs b/source/BP-Essentials/Chat/Commands/Admin/TpHere.cs
@@ -14,16 +14,16 @@ public static void Run(SvPlayer player, string message)
                 player.SendChatMessage(ArgRequired);
                 return;
             }
-            var shPlayer = GetShByStr.Run(arg1);
+            var currPlayer = GetShByStr.Run(arg1);
             var shPlayer1 = player.player;
-            if (shPlayer == null)
+            if (currPlayer == null)
             {
                 player.SendChatMessage(NotFoundOnline);
                 return;
             }
-            shPlayer.svPlayer.ResetAndSavePosition(shPlayer1.GetPosition(), shPlayer1.GetRotation(), shPlayer1.GetPlaceIndex());
-            shPlayer.svPlayer.SendChatMessage($"<color={argColor}>{shPlayer1.username}</color><color={infoColor}> Teleported you to him.</color>");
-            player.SendChatMessage($"<color={infoColor}>Teleported</color> <color={argColor}>{shPlayer.username}</color><color={infoColor}> To you.</color>");
+            currPlayer.svPlayer.ResetAndSavePosition(shPlayer1.GetPosition(), shPlayer1.GetRotation(), shPlayer1.GetPlaceIndex());
+            currPlayer.svPlayer.SendChatMessage($"<color={argColor}>{shPlayer1.username}</color><color={infoColor}> Teleported you to him.</color>");
+            player.SendChatMessage($"<color={infoColor}>Teleported</color> <color={argColor}>{currPlayer.username}</color><color={infoColor}> To you.</color>");
         }
     }
 }
diff --git a/source/BP-Essentials/Chat/Commands/Everyone/Afk.cs b/source/BP-Essentials/Chat/Commands/Everyone/Afk.cs
@@ -1,8 +1,10 @@
 ﻿using System;
 using static BP_Essentials.Variables;
 using System.IO;
-namespace BP_Essentials.Commands {
-    public class Afk {
+namespace BP_Essentials.Commands
+{
+    public class Afk
+    {
         public static void Run(SvPlayer player, string message)
         {
             ReadFile.Run(AfkListFile);
diff --git a/source/BP-Essentials/Chat/Commands/Everyone/ClearChat.cs b/source/BP-Essentials/Chat/Commands/Everyone/ClearChat.cs
@@ -3,27 +3,29 @@
 using static BP_Essentials.Variables;
 using static BP_Essentials.HookMethods;
 
-namespace BP_Essentials.Commands {
-    public class ClearChat {
+namespace BP_Essentials.Commands
+{
+    public class ClearChat
+    {
         public static void Run(SvPlayer player, string message)
         {
             string arg1 = GetArgument.Run(1, false, false, message);
             if (arg1 == "all" || arg1 == "everyone")
             {
                 if (!player.player.admin)
                 {
-                    player.Send(SvSendType.Self, Channel.Unsequenced, 10, MsgNoPerm);
+                    player.SendChatMessage(MsgNoPerm);
                     return;
                 }
                 for (var i = 0; i < 6; i++)
-                    player.Send(SvSendType.All, Channel.Unsequenced, 10, " ");
-                player.Send(SvSendType.All, Channel.Unsequenced, 10, $"<color={argColor}>{player.playerData.username}</color><color={warningColor}> Cleared the chat for everyone.</color>");
+                    player.SendChatMessage(" ");
+                player.SendChatMessage($"<color={argColor}>{player.playerData.username}</color><color={warningColor}> Cleared the chat for everyone.</color>");
             }
             else
             {
                 for (var i = 0; i < 6; i++)
-                    player.Send(SvSendType.Self, Channel.Unsequenced, 10, " ");
-                player.Send(SvSendType.Self, Channel.Unsequenced, 10, $"<color={warningColor}>Cleared the chat for yourself.</color>");
+                    player.SendChatMessage(" ");
+                player.SendChatMessage($"<color={warningColor}>Cleared the chat for yourself.</color>");
             }
         }
     }
diff --git a/source/BP-Essentials/Core.cs b/source/BP-Essentials/Core.cs
@@ -18,6 +18,7 @@
 using System.Reflection;
 using System.Threading;
 using UnityEngine;
+using UniversalUnityHooks;
 using static BP_Essentials.Variables;
 namespace BP_Essentials
 {
diff --git a/source/BP-Essentials/HookChat.cs b/source/BP-Essentials/HookChat.cs
@@ -7,8 +7,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using UnityEngine;
+using UniversalUnityHooks;
 using static BP_Essentials.HookMethods;
 using static BP_Essentials.Variables;
+
 namespace BP_Essentials
 {
     public class HookChat
diff --git a/source/BP-Essentials/HookMethods.cs b/source/BP-Essentials/HookMethods.cs
@@ -9,6 +9,7 @@
 using System.Text;
 using System.Reflection;
 using System.Threading.Tasks;
+using UniversalUnityHooks;
 
 namespace BP_Essentials
 {
@@ -74,8 +75,12 @@ public static bool SpawnBot(SvPlayer player,
         }
 
         [Hook("ShRestraint.HitEffect")]
-        public static bool HitEffect(ShRestraint player, ref ShEntity hitTarget, ref ShPlayer source, ref Collider collider)
+        public static bool HitEffect(ShRestraint restraint, ref ShDestroyable hitTarget, ref ShPlayer source, ref Collider collider)
         {
+            var shPlayer = hitTarget as ShPlayer;
+            if (!shPlayer || shPlayer.IsDead())
+                return true;
+
             if (!PlayerList.TryGetValue(hitTarget.ID, out var hitPlayer))
                 return false;
             if (!GodListPlayers.Contains(hitPlayer.ShPlayer.username))
diff --git a/source/BP-Essentials/Properties/AssemblyInfo.cs b/source/BP-Essentials/Properties/AssemblyInfo.cs
@@ -15,4 +15,4 @@
 
 
 // Change BPE Version here
-[assembly: AssemblyFileVersion("2.6.5")]
+[assembly: AssemblyFileVersion("2.6.6")]

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`using System;`
`2`	`2`	`using static BP_Essentials.Variables;`
`3`		`-namespace BP_Essentials.Commands {`
`4`		`- public class Ban`
	`3`	`+namespace BP_Essentials.Commands`
	`4`	`+{`
	`5`	`+ class Ban`
`5`	`6`	`{`
`6`	`7`	`public static void Run(SvPlayer player, string message)`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public static void Run(SvPlayer player, string message)`
`23`	`23`	`foreach (var item in shPlayer.myItems.Values)`
`24`	`24`	`tempList.Add(item);`
`25`	`25`	`for (int i = 0; i < tempList.Count; i++)`
`26`		`- shPlayer.TransferItem(2, tempList[i].item.index, shPlayer.MyItemCount(tempList[i].item.index), true);`
	`26`	`+ shPlayer.TransferItem(DeltaInv.RemoveFromMe, tempList[i].item.index, shPlayer.MyItemCount(tempList[i].item.index), true);`
`27`	`27`	`player.SendChatMessage($"<color={infoColor}>You cleared the inventory of</color> <color={argColor}>{shPlayer.username}</color><color={infoColor}>.</color>");`
`28`	`28`	`shPlayer.svPlayer.SendChatMessage($"<color={warningColor}>Your inventory has been cleared by</color> <color={argColor}>{player.playerData.username}</color><color={warningColor}>.</color>");`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace BP_Essentials.Commands`
`11`	`11`	`{`
`12`		`- class Setjob : SvPlayer`
	`12`	`+ class SetJob : SvPlayer`
`13`	`13`	`{`
`14`	`14`	`public static void Run(SvPlayer player, string message)`
`15`	`15`	`{`
`@@ -46,7 +46,7 @@ public static void Run(SvPlayer player, string message)`
`46`	`46`	`return;`
`47`	`47`	`}`
`48`	`48`	`player.SendChatMessage(string.Format(msg, currPlayer.username, Jobs[arg1Parsed]));`
`49`		`- player.SvSetJob(player.player.jobs[arg1Parsed], true, false);`
	`49`	`+ currPlayer.svPlayer.SvSetJob(player.player.jobs[arg1Parsed], true, false);`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,9 @@ public static void Run(SvPlayer player, string message)`
`10`	`10`	`{`
`11`	`11`	`var pos = player.player.GetPosition();`
`12`	`12`	`var rot = player.player.GetRotation();`
	`13`	`+ var placeIndex = player.player.GetPlaceIndex();`
`13`	`14`	`foreach (var currPlayer in SvMan.players.Values)`
`14`		`- currPlayer.svPlayer.ResetAndSavePosition(pos, rot, player.player.GetPlaceIndex());`
	`15`	`+ currPlayer.svPlayer.ResetAndSavePosition(pos, rot, placeIndex);`
`15`	`16`	`player.SendChatMessage($"<color={infoColor}>Teleported</color> <color={argColor}>everyone</color> <color={infoColor}>to your location.</color>");`
`16`	`17`	`}`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,16 +14,16 @@ public static void Run(SvPlayer player, string message)`
`14`	`14`	`player.SendChatMessage(ArgRequired);`
`15`	`15`	`return;`
`16`	`16`	`}`
`17`		`- var shPlayer = GetShByStr.Run(arg1);`
	`17`	`+ var currPlayer = GetShByStr.Run(arg1);`
`18`	`18`	`var shPlayer1 = player.player;`
`19`		`- if (shPlayer == null)`
	`19`	`+ if (currPlayer == null)`
`20`	`20`	`{`
`21`	`21`	`player.SendChatMessage(NotFoundOnline);`
`22`	`22`	`return;`
`23`	`23`	`}`
`24`		`- shPlayer.svPlayer.ResetAndSavePosition(shPlayer1.GetPosition(), shPlayer1.GetRotation(), shPlayer1.GetPlaceIndex());`
`25`		`- shPlayer.svPlayer.SendChatMessage($"<color={argColor}>{shPlayer1.username}</color><color={infoColor}> Teleported you to him.</color>");`
`26`		`- player.SendChatMessage($"<color={infoColor}>Teleported</color> <color={argColor}>{shPlayer.username}</color><color={infoColor}> To you.</color>");`
	`24`	`+ currPlayer.svPlayer.ResetAndSavePosition(shPlayer1.GetPosition(), shPlayer1.GetRotation(), shPlayer1.GetPlaceIndex());`
	`25`	`+ currPlayer.svPlayer.SendChatMessage($"<color={argColor}>{shPlayer1.username}</color><color={infoColor}> Teleported you to him.</color>");`
	`26`	`+ player.SendChatMessage($"<color={infoColor}>Teleported</color> <color={argColor}>{currPlayer.username}</color><color={infoColor}> To you.</color>");`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,27 +3,29 @@`
`3`	`3`	`using static BP_Essentials.Variables;`
`4`	`4`	`using static BP_Essentials.HookMethods;`
`5`	`5`
`6`		`-namespace BP_Essentials.Commands {`
`7`		`- public class ClearChat {`
	`6`	`+namespace BP_Essentials.Commands`
	`7`	`+{`
	`8`	`+ public class ClearChat`
	`9`	`+ {`
`8`	`10`	`public static void Run(SvPlayer player, string message)`
`9`	`11`	`{`
`10`	`12`	`string arg1 = GetArgument.Run(1, false, false, message);`
`11`	`13`	`if (arg1 == "all" \|\| arg1 == "everyone")`
`12`	`14`	`{`
`13`	`15`	`if (!player.player.admin)`
`14`	`16`	`{`
`15`		`- player.Send(SvSendType.Self, Channel.Unsequenced, 10, MsgNoPerm);`
	`17`	`+ player.SendChatMessage(MsgNoPerm);`
`16`	`18`	`return;`
`17`	`19`	`}`
`18`	`20`	`for (var i = 0; i < 6; i++)`
`19`		`- player.Send(SvSendType.All, Channel.Unsequenced, 10, " ");`
`20`		`- player.Send(SvSendType.All, Channel.Unsequenced, 10, $"<color={argColor}>{player.playerData.username}</color><color={warningColor}> Cleared the chat for everyone.</color>");`
	`21`	`+ player.SendChatMessage(" ");`
	`22`	`+ player.SendChatMessage($"<color={argColor}>{player.playerData.username}</color><color={warningColor}> Cleared the chat for everyone.</color>");`
`21`	`23`	`}`
`22`	`24`	`else`
`23`	`25`	`{`
`24`	`26`	`for (var i = 0; i < 6; i++)`
`25`		`- player.Send(SvSendType.Self, Channel.Unsequenced, 10, " ");`
`26`		`- player.Send(SvSendType.Self, Channel.Unsequenced, 10, $"<color={warningColor}>Cleared the chat for yourself.</color>");`
	`27`	`+ player.SendChatMessage(" ");`
	`28`	`+ player.SendChatMessage($"<color={warningColor}>Cleared the chat for yourself.</color>");`
`27`	`29`	`}`
`28`	`30`	`}`
`29`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`using System.Reflection;`
`19`	`19`	`using System.Threading;`
`20`	`20`	`using UnityEngine;`
	`21`	`+using UniversalUnityHooks;`
`21`	`22`	`using static BP_Essentials.Variables;`
`22`	`23`	`namespace BP_Essentials`
`23`	`24`	`{`