fixed for real this time

Author: marchellcx

LabExtended/API/ExPlayer.cs

@@ -1661,6 +1661,9 @@ private void RefreshCustomInfo()
 
     private void RefreshModifiers()
     {
+        if (ApiLoader.ApiConfig == null || ApiLoader.ApiConfig.DisableCustomModifiers)
+            return;
+        
         var inventory = ReferenceHub.inventory;
 
         inventory._staminaModifier = 1f;
@@ -1705,7 +1708,7 @@ private void RefreshModifiers()
         inventory.Network_syncStaminaModifier = refreshingEventArgs.StaminaUsageMultiplier;
         inventory.Network_syncMovementMultiplier = refreshingEventArgs.MovementSpeedMultiplier;
         inventory.Network_syncMovementLimiter = refreshingEventArgs.MovementSpeedLimiter;
-        inventory.Network_syncStaminaModifier = refreshingEventArgs.SprintSpeedMultiplier;
+        inventory.Network_syncSprintMultiplier = refreshingEventArgs.SprintSpeedMultiplier;
     }
 
     private void UpdateCustomRole()

LabExtended/Core/Configs/ApiConfig.cs

@@ -39,6 +39,12 @@ public class ApiConfig
         /// </summary>
         [Description("Whether or not to ignore permission requirements..")]
         public bool OverridePermissions { get; set; } = false;
+        
+        /// <summary>
+        /// Gets or sets a value indicating whether custom modifiers are disabled.
+        /// </summary>
+        [Description("Whether or not to disable custom modifiers.")]
+        public bool DisableCustomModifiers { get; set; }
 
         /// <summary>
         /// Gets or sets a list of IPs that should be overriden by the player's token request IP.'

LabExtended/Events/InternalEvents.cs

@@ -75,21 +75,26 @@ internal static void HandlePlayerVerified(ExPlayer player)
                 }
             }
 
-            if (player.Connection != null
-                && player.ConnectionToClient != null
-                && !string.IsNullOrWhiteSpace(player.ConnectionToClient.address)
-                && ApiLoader.ApiConfig?.TokenIpOverride?.Count > 0
-                && ApiLoader.ApiConfig.TokenIpOverride.Contains(player.ConnectionToClient.address)
-                && player.ReferenceHub.authManager != null
-                && player.ReferenceHub.authManager.AuthenticationResponse.AuthToken != null
-                && !string.IsNullOrEmpty(player.ReferenceHub.authManager.AuthenticationResponse.AuthToken.RequestIp))
+            if (player.Connection != null && player.ConnectionToClient != null)
             {
-                player.ConnectionToClient.IpOverride =
-                    player.ReferenceHub.authManager.AuthenticationResponse.AuthToken.RequestIp;
-                player.ReferenceHub.queryProcessor._ipAddress = player.ConnectionToClient.IpOverride;
-                
-                ApiLog.Debug("LabExtended", $"Overriden IP of &1{player.UserId}&r to &3{player.ConnectionToClient.address}&r" +
-                                            $" (&6{player.ConnectionToClient.OriginalIpAddress}&r)");
+                if (!string.IsNullOrWhiteSpace(player.ConnectionToClient.address)
+                    && ApiLoader.ApiConfig?.TokenIpOverride?.Count > 0
+                    && ApiLoader.ApiConfig.TokenIpOverride.Contains(player.ConnectionToClient.address)
+                    && player.ReferenceHub.authManager != null
+                    && player.ReferenceHub.authManager.AuthenticationResponse.AuthToken != null
+                    && !string.IsNullOrEmpty(player.ReferenceHub.authManager.AuthenticationResponse.AuthToken.RequestIp))
+                {
+                    player.ConnectionToClient.IpOverride = player.ReferenceHub.authManager.AuthenticationResponse.AuthToken.RequestIp;
+                    player.ReferenceHub.queryProcessor._ipAddress = player.ConnectionToClient.IpOverride;
+
+                    ApiLog.Debug("LabExtended",
+                        $"Overriden IP of &1{player.UserId}&r to &3{player.ConnectionToClient.address}&r" +
+                        $" (&6{player.ConnectionToClient.OriginalIpAddress}&r)");
+                }
+                else
+                {
+                    player.ConnectionToClient.IpOverride = player.ConnectionToClient.address;
+                }
             }
 
             ApiLog.Info("LabExtended",

LabExtended/Patches/Events/Player/PlayerLeavingPatch.cs

@@ -19,18 +19,17 @@ private static bool Prefix(NetPeer peer, DisconnectInfo disconnectinfo)
     {
         LiteNetLib4MirrorTransport.Singleton.Events.Enqueue(delegate
         {
+            ExPlayer? player = ExPlayer.Get(peer);
+        
+            if (player?.ReferenceHub != null)
+                ExPlayerEvents.OnLeaving((new(player, disconnectinfo.Reason is DisconnectReason.Timeout, disconnectinfo)));
+            
             LiteNetLib4MirrorCore.LastDisconnectError = disconnectinfo.SocketErrorCode;
             LiteNetLib4MirrorCore.LastDisconnectReason = disconnectinfo.Reason;
 
             LiteNetLib4MirrorTransport.Singleton.OnServerDisconnected(peer.Id + 1);
-
-            if (LiteNetLib4MirrorServer.Peers.TryRemove(peer.Id + 1, out var netPeer))
-            {
-                ExPlayer? player = ExPlayer.Get(peer);
-        
-                if (player?.ReferenceHub != null)
-                    ExPlayerEvents.OnLeaving((new(player, disconnectinfo is { Reason: DisconnectReason.Timeout }, disconnectinfo)));
-            }
+            
+            LiteNetLib4MirrorServer.Peers.TryRemove(peer.Id + 1, out _);
         });
 
         return false;

LabExtended/Patches/Functions/Players/DisableRefreshModifiersPatch.cs

@@ -2,6 +2,8 @@
 
 using InventorySystem;
 
+using LabExtended.Core;
+
 namespace LabExtended.Patches.Functions.Players
 {
     /// <summary>
@@ -11,6 +13,6 @@ public static class DisableRefreshModifiersPatch
     {
         [HarmonyPatch(typeof(Inventory), nameof(Inventory.RefreshModifiers))]
         private static bool Prefix(Inventory __instance)
-            => false;
+            => ApiLoader.ApiConfig == null || ApiLoader.ApiConfig.DisableCustomModifiers;
     }
 }