- Fixed Medigun storing improper previous roles.

- Fixed LuckyCoin not de-spawning when dropped in the Pocket Dimension.
Exiled-Team · Feb 5, 2021 · afe5b50 · afe5b50
1 parent ddd18cf
commit afe5b50
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/CustomItems/Items/LuckyCoin.cs b/CustomItems/Items/LuckyCoin.cs
@@ -20,15 +20,15 @@ public LuckyCoin(ItemType type, int itemId) : base(type, itemId)
 
         protected override void LoadEvents()
         {
-            Exiled.Events.Handlers.Player.DroppingItem += OnDroppingItemLC;
+            Exiled.Events.Handlers.Player.DroppingItem += OnDroppingItem;
             Exiled.Events.Handlers.Server.WaitingForPlayers += OnWaitingForPlayersLC;
             Exiled.Events.Handlers.Player.EnteringPocketDimension += OnEnterPocketDimension;
             base.LoadEvents();
         }
 
         protected override void UnloadEvents()
         {
-            Exiled.Events.Handlers.Player.DroppingItem -= OnDroppingItemLC;
+            Exiled.Events.Handlers.Player.DroppingItem -= OnDroppingItem;
             Exiled.Events.Handlers.Server.WaitingForPlayers -= OnWaitingForPlayersLC;
             Exiled.Events.Handlers.Player.EnteringPocketDimension -= OnEnterPocketDimension;
             base.UnloadEvents();
@@ -44,7 +44,7 @@ private void OnWaitingForPlayersLC()
                 teleports.Add(teleport);
         }
 
-        private void OnDroppingItemLC(DroppingItemEventArgs ev)
+        protected override void OnDroppingItem(DroppingItemEventArgs ev)
         {
             if (CheckItem(ev.Item))
             {
@@ -53,6 +53,8 @@ private void OnDroppingItemLC(DroppingItemEventArgs ev)
                     Log.Debug($"{Name} has been dropped in the Pocket Dimension.", Plugin.Singleton.Config.Debug);
                     isDropped = true;
                 }
+                else
+                    base.OnDroppingItem(ev);
             }
         }
 

diff --git a/CustomItems/Items/MediGun.cs b/CustomItems/Items/MediGun.cs
@@ -22,15 +22,16 @@ protected override void LoadEvents()
         {
             Exiled.Events.Handlers.Player.Shooting += OnShooting;
             if (Plugin.Singleton.Config.ItemConfigs.MediCfg.HealZombies)
-                Exiled.Events.Handlers.Scp049.FinishingRecall += OnFinishingRecall;
+                Exiled.Events.Handlers.Player.Dying += OnDyingMG;
             base.LoadEvents();
         }
+
 
         protected override void UnloadEvents()
         {
             Exiled.Events.Handlers.Player.Shooting -= OnShooting;
             if (Plugin.Singleton.Config.ItemConfigs.MediCfg.HealZombies)
-                Exiled.Events.Handlers.Scp049.FinishingRecall -= OnFinishingRecall;
+                Exiled.Events.Handlers.Player.Dying -= OnDyingMG;
             base.UnloadEvents();
         }
 
@@ -39,8 +40,19 @@ protected override void OnWaitingForPlayers()
             previousRoles.Clear();
             base.OnWaitingForPlayers();
         }
+
+        private Dictionary<Player, RoleType> previousRoles = new Dictionary<Player, RoleType>();
+
+        private void OnDyingMG(DyingEventArgs ev)
+        {
+            if (ev.Target.IsHuman && ev.Killer.Role == RoleType.Scp049)
+            {
+                if (!previousRoles.ContainsKey(ev.Target))
+                    previousRoles.Add(ev.Target, RoleType.None);
 
-        Dictionary<Player, RoleType> previousRoles = new Dictionary<Player, RoleType>();
+                previousRoles[ev.Target] = ev.Target.Role;
+            }
+        }
 
         private void OnShooting(ShootingEventArgs ev)
         {
@@ -65,14 +77,6 @@ private void OnShooting(ShootingEventArgs ev)
                 }
             }
         }
-
-        private void OnFinishingRecall(FinishingRecallEventArgs ev)
-        {
-            if (!previousRoles.ContainsKey(ev.Target))
-                previousRoles.Add(ev.Target, ev.Target.Role);
-            else
-                previousRoles[ev.Target] = ev.Target.Role;
-        }
 
         private void DoReviveZombie(Player player)
         {

diff --git a/CustomItems/Plugin.cs b/CustomItems/Plugin.cs
@@ -22,7 +22,7 @@ public class Plugin : Plugin<Config>
         public override string Author { get; } = "Galaxy119";
         public override string Name { get; } = "CustomItems";
         public override string Prefix { get; } = "CustomItems";
-        public override Version Version { get; } = new Version(1, 5, 0);
+        public override Version Version { get; } = new Version(1, 5, 1);
         public override Version RequiredExiledVersion { get; } = new Version(2, 1, 30);
 
         public Methods Methods { get; private set; }