Fix ChargingJailbird (#2)

* Update ChargingJailbirdEventArgs.cs * Update JailbirdPatch.cs * Update dev.yml * Update labeler.yml
NotZer0Two · Aug 1, 2024 · 2e1686e · 2e1686e
1 parent 0698e6e
commit 2e1686e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/EXILED/Exiled.Events/EventArgs/Item/ChargingJailbirdEventArgs.cs b/EXILED/Exiled.Events/EventArgs/Item/ChargingJailbirdEventArgs.cs
@@ -7,6 +7,8 @@
 
 namespace Exiled.Events.EventArgs.Item
 {
+    using System;
+
     using Exiled.API.Features;
     using Exiled.API.Features.Items;
     using Exiled.Events.EventArgs.Interfaces;
@@ -26,7 +28,9 @@ public ChargingJailbirdEventArgs(ReferenceHub player, InventorySystem.Items.Item
         {
             Player = Player.Get(player);
             Item = Item.Get(swingItem);
+#pragma warning disable CS0618
             IsAllowed = isAllowed;
+#pragma warning restore CS0618
         }
 
         /// <summary>
@@ -42,6 +46,11 @@ public ChargingJailbirdEventArgs(ReferenceHub player, InventorySystem.Items.Item
         /// <summary>
         /// Gets or sets a value indicating whether or not the Jailbird can be charged.
         /// </summary>
-        public bool IsAllowed { get; set; }
+        public bool IsAllowed
+        {
+            get;
+            [Obsolete("This event cannot be denied as it will cause desync.")]
+            set;
+        }
     }
 }
diff --git a/EXILED/Exiled.Events/Patches/Events/Item/JailbirdPatch.cs b/EXILED/Exiled.Events/Patches/Events/Item/JailbirdPatch.cs
@@ -88,10 +88,7 @@ private static bool HandleJailbird(JailbirdItem instance, JailbirdMessageType me
                     ChargingJailbirdEventArgs ev = new(instance.Owner, instance);
 
                     Item.OnChargingJailbird(ev);
-                    if (ev.IsAllowed)
-                            return true;
-                    instance.SendRpc(JailbirdMessageType.ChargeFailed, null);
-                    return false;
+                    return true;
                 }
 
                 default: