Allow pickups

yonilerner · Apr 4, 2024 · 0eaf9bb · 0eaf9bb
1 parent 6300edd
commit 0eaf9bb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/RetakesAllocator/RetakesAllocator.cs b/RetakesAllocator/RetakesAllocator.cs
@@ -315,6 +315,12 @@ public HookResult OnWeaponCanAcquire(DynamicHook hook)
             return HookResult.Continue;
         }
 
+        var acquireMethod = hook.GetParam<AcquireMethod>(2);
+        if (acquireMethod == AcquireMethod.PickUp)
+        {
+            return HookResult.Continue;
+        }
+
         if (Helpers.IsWarmup())
         {
             return HookResult.Continue;
@@ -329,7 +335,6 @@ public HookResult OnWeaponCanAcquire(DynamicHook hook)
 
         HookResult RetStop()
         {
-            var acquireMethod = hook.GetParam<AcquireMethod>(2);
             // Log.Debug($"Exiting OnWeaponCanAcquire {acquireMethod}");
             hook.SetReturn(
                 acquireMethod != AcquireMethod.PickUp
@@ -584,9 +589,7 @@ out var currentRoundType
             var roundType = RoundTypeManager.Instance.GetCurrentRoundType()!.Value;
             var roundTypeName = RoundTypeHelpers.TranslateRoundTypeName(roundType);
             var message = Translator.Instance["announcement.roundtype", roundTypeName];
-            Server.PrintToChatAll(
-                $"{MessagePrefix}{message}"
-            );
+            Server.PrintToChatAll($"{MessagePrefix}{message}");
             if (Configs.GetConfigData().EnableRoundTypeAnnouncementCenter)
             {
                 foreach (var player in allPlayers)

diff --git a/RetakesAllocatorCore/Config/Configs.cs b/RetakesAllocatorCore/Config/Configs.cs
@@ -214,7 +214,7 @@ public Dictionary<
     public bool ResetStateOnGameRestart { get; set; } = true;
     public bool AllowAllocationAfterFreezeTime { get; set; } = true;
     public bool EnableRoundTypeAnnouncement { get; set; } = true;
-    public bool EnableRoundTypeAnnouncementCenter { get; set; } = true;
+    public bool EnableRoundTypeAnnouncementCenter { get; set; } = false;
     public bool EnableNextRoundTypeVoting { get; set; } = false;
     public int NumberOfExtraVipChancesForPreferredWeapon { get; set; } = 1;
     public bool AllowPreferredWeaponForEveryone { get; set; } = false;

diff --git a/RetakesAllocatorCore/PluginInfo.cs b/RetakesAllocatorCore/PluginInfo.cs
@@ -5,7 +5,7 @@ namespace RetakesAllocatorCore;
 
 public static class PluginInfo
 {
-    public const string Version = "2.3.1";
+    public const string Version = "2.3.2";
 
     public static readonly string LogPrefix = $"[RetakesAllocator {Version}] ";