Update to game version 0.78a

* Fixed a bug with selling your apartment * Logs bans in console now
BPEssentials · May 17, 2018 · a083b10 · a083b10
1 parent 7fbbb90
commit a083b10
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/source/BP-Essentials/Chat/Commands/Everyone/Confirm.cs b/source/BP-Essentials/Chat/Commands/Everyone/Confirm.cs
@@ -13,6 +13,7 @@ class Confirm : EssentialsChatPlugin
         public static bool Run(object oPlayer)
         {
             var player = (SvPlayer)oPlayer;
+
             foreach (var shPlayer in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
                 if (shPlayer.svPlayer == player && shPlayer.IsRealPlayer())
                     if (shPlayer.ownedApartment)
@@ -26,4 +27,4 @@ public static bool Run(object oPlayer)
             return true;
         }
     }
-}
+}
diff --git a/source/BP-Essentials/EssentialsMethods.cs b/source/BP-Essentials/EssentialsMethods.cs
@@ -13,12 +13,16 @@ namespace BP_Essentials
 {
     public class EssentialsMethodsPlugin : EssentialsCorePlugin
     {
+
         [Hook("SvPlayer.SvSellApartment")]
         public static bool SvSellApartment(SvPlayer player)
         {
-            Confirmed = false;
             if (Confirmed)
+            {
+                Confirmed = false;
                 return false;
+            }
+            Confirmed = false;
             player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={warningColor}>Are you sure you want to sell your apartment? Type '</color><color={argColor}>{CmdConfirm}</color><color={warningColor}>' to confirm.</color>");
             return true;
         }
@@ -27,6 +31,7 @@ public static bool SvSellApartment(SvPlayer player)
         public static void Initialize(SvPlayer player)
         {
             ShPlayer shPlayer = (ShPlayer)typeof(SvPlayer).GetField(nameof(player), BindingFlags.NonPublic | BindingFlags.Instance).GetValue(player);
+
             if (shPlayer.IsRealPlayer())
             {
                 var thread1 = new Thread(new ParameterizedThreadStart(WriteIpToFile.Run));
@@ -84,7 +89,10 @@ public static void SvBan(SvPlayer player, ref int otherID)
             foreach (var shPlayer in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
                 if (shPlayer.ID == otherID)
                     if (shPlayer.IsRealPlayer() && !shPlayer.svPlayer.IsServerside())
+                    {
+                        Debug.Log($"{SetTimeStamp.Run()}[INFO] {shPlayer.username} Got banned by {player.playerData.username}");
                         player.SendToAll(Channel.Unsequenced, ClPacket.GameMessage, $"<color={argColor}>{shPlayer.username}</color> <color={warningColor}>Just got banned by</color> <color={argColor}>{player.playerData.username}</color>");
+                    }
         }
 
         [Hook("SvPlayer.SvStartVote")]
@@ -251,6 +259,7 @@ public static bool SvFunctionKey(SvPlayer player, ref byte key)
                                     else if (item.Key.LastMenu == CurrentMenu.ServerInfo)
                                     {
                                         player.SendToSelf(Channel.Reliable, ClPacket.CloseFunctionMenu);
+
                                         var builder = new StringBuilder();
                                         builder.Append("All admins on this server:\n\n");
                                         foreach (var line in File.ReadAllLines("admin_list.txt"))
@@ -322,6 +331,7 @@ public static bool SvFunctionKey(SvPlayer player, ref byte key)
                                     if (item.Key.LastMenu == CurrentMenu.Main)
                                     {
                                         var sb = new StringBuilder().Append("<color=#00ffffff>Staff menu:</color>\n\n");
+
                                         if (HasPermission.Run(player, AccessMoneyMenu))
                                             sb.Append("<color=#00ffffff>F2:</color> Give Money\n");
                                         if (HasPermission.Run(player, AccessItemMenu))
@@ -338,7 +348,6 @@ public static bool SvFunctionKey(SvPlayer player, ref byte key)
                                     break;
                             }
                         }
-
                     }
                     return true;
                 }
@@ -352,19 +361,19 @@ public static bool SvFunctionKey(SvPlayer player, ref byte key)
                 ErrorLogging.Run(ex);
             }
             return true;
-
         }
 
         [Hook("SvPlayer.SvSuicide")]
         public static bool SvSuicide(SvPlayer player)
         {
             if (player.IsServerside())
                 return true;
+
             var shPlayer = GetShBySv.Run(player);
+
             if (shPlayer.IsDead())
                 return true;
 
-
             shPlayer.ShDie();
             player.SendToLocalAndSelf(Channel.Reliable, ClPacket.UpdateHealth, shPlayer.ID, shPlayer.health);
             return true;

diff --git a/source/BP-Essentials/EssentialsVariables.cs b/source/BP-Essentials/EssentialsVariables.cs
@@ -7,7 +7,7 @@ namespace BP_Essentials
 {
     public class EssentialsVariablesPlugin : EssentialsCorePlugin
     {
-        public const string Version = "2.2.12";
+        public const string Version = "2.2.13";
 
         // Generic Constants
         public const string FileDirectory = "Essentials/";