fix pickups on escape

disable appearances bc not works

Author: SlejmUr

SimpleCustomRoles/Handler/PlayerHandler.cs

@@ -16,9 +16,11 @@ public class PlayerHandler : CustomEventsHandler
 {
     public override void OnPlayerChangingRole(PlayerChangingRoleEventArgs ev)
     {
+        ev.Player.ClearBroadcasts();
         PlayerEscaped.Remove(ev.Player);
         if (ev.ChangeReason != PlayerRoles.RoleChangeReason.None)
             CustomRoleHelpers.UnSetCustomInfoToPlayer(ev.Player, false);
+        /*
         if (ev.ChangeReason == PlayerRoles.RoleChangeReason.Destroyed)
             return;
         if (ev.ChangeReason == PlayerRoles.RoleChangeReason.Died)
@@ -28,6 +30,7 @@ public override void OnPlayerChangingRole(PlayerChangingRoleEventArgs ev)
         if (ev.NewRole == PlayerRoles.RoleTypeId.Destroyed)
             return;
         Timing.CallDelayed(0.2f, () => AppearanceSyncExtension.ForceSync(ev.Player));
+        */
     }
 
     public override void OnPlayerDroppingItem(PlayerDroppingItemEventArgs ev)
@@ -64,7 +67,6 @@ public override void OnPlayerChangedSpectator(PlayerChangedSpectatorEventArgs ev
             return;
         if (ev.OldTarget != null && CustomRoleHelpers.Contains(ev.OldTarget))
         {
-            // todo dont clear, just queue
             ev.Player.ClearBroadcasts();
         }
         if (ev.NewTarget != null && CustomRoleHelpers.TryGetCustomRole(ev.NewTarget, out var role))
@@ -147,6 +149,7 @@ public override void OnPlayerDeath(PlayerDeathEventArgs ev)
 
     public override void OnPlayerEscaping(PlayerEscapingEventArgs ev)
     {
+        List<Pickup> droppedItems = [];
         Player player = ev.Player;
         if (PlayerEscaped.Contains(player))
             return;
@@ -162,7 +165,6 @@ public override void OnPlayerEscaping(PlayerEscapingEventArgs ev)
             var roleTypeToEscapeTo = potentialEscapeRoles.Select(static x => x.Value).FirstOrDefault();
             if (roleTypeToEscapeTo == PlayerRoles.RoleTypeId.None)
                 return;
-            List<Pickup> droppedItems = [];
             foreach (var item in player.Items.ToList())
             {
                 var dropped = item.DropItem();
@@ -174,7 +176,7 @@ public override void OnPlayerEscaping(PlayerEscapingEventArgs ev)
             ev.EscapeScenario = Escape.EscapeScenarioType.Custom;
             PlayerEscaped.Add(player);
             Timing.CallDelayed(1.5f, () => PlayerEscaped.Remove(player));
-            Timing.CallDelayed(3.5f, () =>
+            Timing.CallDelayed(2.5f, () =>
             {
                 foreach (var item in droppedItems)
                 {
@@ -203,12 +205,20 @@ public override void OnPlayerEscaping(PlayerEscapingEventArgs ev)
         {
             var dropped = item.DropItem();
             dropped.IsLocked = true;
-            storage.ItemsAfterEscaped.Add(dropped);
+            droppedItems.Add(dropped);
         }
         var success = CustomRoleHelpers.SetNewRole(player, roleToEscapeTo, true);
         PlayerEscaped.Add(player);
         Timing.CallDelayed(1.5f, () => PlayerEscaped.Remove(player));
-        Timing.CallDelayed(3.5f, storage.ItemsAfterEscaped.Clear);
+        Timing.CallDelayed(2.5f, () =>
+        {
+            foreach (var item in droppedItems)
+            {
+                item.Position = player.Position;
+                item.IsLocked = false;
+                item.IsInUse = false;
+            }
+        });
     }
 
     public override void OnServerWaveRespawned(WaveRespawnedEventArgs ev)
@@ -236,9 +246,11 @@ public override void OnServerWaveRespawned(WaveRespawnedEventArgs ev)
         {
             Main.Instance.InWaveRoles.Remove(item);
         }
+        /*
         foreach (var item in ev.Players)
         {
             AppearanceSyncExtension.ForceSync(item);
         }
+        */
     }
 }

SimpleCustomRoles/Handler/ServerHandler.cs

@@ -14,7 +14,7 @@ internal class ServerHandler : CustomEventsHandler
 {
     public override void OnServerRoundEnded(RoundEndedEventArgs ev)
     {
-        AppearanceSyncExtension.Stop();
+        //AppearanceSyncExtension.Stop();
     }
 
     public static void ReloadRoles()
@@ -49,7 +49,7 @@ public override void OnServerWaitingForPlayers()
 
     public override void OnServerRoundStarted()
     {
-        AppearanceSyncExtension.Start();
+        //AppearanceSyncExtension.Start();
         if (Main.Instance.Config.IsPaused)
             return;
 

SimpleCustomRoles/RoleInfo/CustomRoleInfoStorage.cs

@@ -24,7 +24,6 @@ public class CustomRoleInfoStorage(Player owner) : CustomDataStore(owner)
     private bool onDefaultScale;
     public CustomRoleBaseInfo Role;
     public string OldCustomInfo = string.Empty;
-    public List<Pickup> ItemsAfterEscaped = [];
     public bool ResetRole { get; set; }
     public void Apply()
     {
@@ -38,7 +37,13 @@ public void Reset()
         Role = null;
         Owner.IsBypassEnabled = false;
         ScaleHelper.SetScale(Owner, Vector3.one);
-        AppearanceSyncExtension.RemovePlayer(Owner, false);
+        /*
+        foreach (var item in Player.ReadyList.Where(x => x != Owner))
+        {
+            FpcServerPositionDistributor.SendRole(item.ReferenceHub, Owner.ReferenceHub, Owner.Role);
+        }
+        */
+        //AppearanceSyncExtension.RemovePlayer(Owner, false);
         Owner.Position += Vector3.up;
         if (string.IsNullOrEmpty(OldCustomInfo))
             OldCustomInfo = string.Empty;
@@ -172,14 +177,6 @@ private void SetInventory()
                 Server.RunCommand(string.Format(Main.Instance.Config.CustomItemCommand, item, Owner.PlayerId));
             }
         }
-
-        foreach (var item in ItemsAfterEscaped)
-        {
-            item.Position = Owner.Position;
-            item.IsLocked = false;
-            if (!Owner.IsInventoryFull)
-                Owner.AddItem(item);
-        }
     }
 
     private void SetMaxStats()
@@ -245,7 +242,13 @@ private void SetFpc()
         //  Appearance
         if (Role.Fpc.Appearance != PlayerRoles.RoleTypeId.None)
         {
-            AppearanceSyncExtension.AddPlayer(Owner, Role.Fpc.Appearance);
+            /*
+            foreach (var item in Player.ReadyList.Where(x => x != Owner))
+            {
+                FpcServerPositionDistributor.SendRole(item.ReferenceHub, Owner.ReferenceHub, Role.Fpc.Appearance);
+            }
+            */
+            //AppearanceSyncExtension.AddPlayer(Owner, Role.Fpc.Appearance);
         }
         // Voice Channel
         if (Role.Fpc.VoiceChatChannel != VoiceChat.VoiceChatChannel.None)