fixing up implosion grenades

Exiled-Team · Feb 24, 2022 · b5183e6 · b5183e6
1 parent f7a5a63
commit b5183e6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/CustomItems/Items/ImplosionGrenade.cs b/CustomItems/Items/ImplosionGrenade.cs
@@ -147,7 +147,7 @@ protected override void OnExploding(ExplodingGrenadeEventArgs ev)
 
                     bool line = Physics.Linecast(ev.Grenade.transform.position, player.Position, layerMask);
                     Log.Debug($"{player.Nickname} - {line}", CustomItems.Instance.Config.IsDebugEnabled);
-                    if (!line)
+                    if (line)
                     {
                         effectedPlayers.Add(player);
                         Coroutines.Add(Timing.RunCoroutine(DoSuction(player, ev.Grenade.transform.position + (Vector3.up * 1.5f))));

diff --git a/CustomItems/Items/LuckyCoin.cs b/CustomItems/Items/LuckyCoin.cs
@@ -24,7 +24,6 @@ namespace CustomItems.Items
     /// <inheritdoc />
     public class LuckyCoin : CustomItem
     {
-        private readonly List<PocketDimensionTeleport> teleports = new List<PocketDimensionTeleport>();
         private bool isDropped;
         private bool onCooldown;
 
@@ -68,15 +67,13 @@ public class LuckyCoin : CustomItem
         /// <inheritdoc/>
         protected override void SubscribeEvents()
         {
-            Server.RoundStarted += OnRoundStart;
             Player.EnteringPocketDimension += OnEnterPocketDimension;
             base.SubscribeEvents();
         }
 
         /// <inheritdoc/>
         protected override void UnsubscribeEvents()
         {
-            Server.RoundStarted -= OnRoundStart;
             Player.EnteringPocketDimension -= OnEnterPocketDimension;
             base.UnsubscribeEvents();
         }
@@ -109,17 +106,6 @@ protected override void OnDropping(DroppingItemEventArgs ev)
             }
         }
 
-        private void OnRoundStart()
-        {
-            teleports.Clear();
-
-            foreach (PocketDimensionTeleport teleport in Object.FindObjectsOfType<PocketDimensionTeleport>())
-            {
-                teleports.Add(teleport);
-                Log.Debug("Adding PD Teleport..", CustomItems.Instance.Config.IsDebugEnabled);
-            }
-        }
-
         private void OnEnterPocketDimension(EnteringPocketDimensionEventArgs ev)
         {
             Log.Debug($"{ev.Player.Nickname} Entering Pocket Dimension.", CustomItems.Instance.Config.IsDebugEnabled);
@@ -133,7 +119,7 @@ private void OnEnterPocketDimension(EnteringPocketDimensionEventArgs ev)
                 return;
 
             Log.Debug($"{ev.Player.Nickname} - EPD checks passed.", CustomItems.Instance.Config.IsDebugEnabled);
-            foreach (PocketDimensionTeleport teleport in teleports)
+            foreach (PocketDimensionTeleport teleport in Map.PocketDimensionTeleports)
             {
                 Log.Debug($"{ev.Player.Nickname} - Checking teleporter..", CustomItems.Instance.Config.IsDebugEnabled);
                 if (teleport._type != PocketDimensionTeleport.PDTeleportType.Exit)

diff --git a/CustomItems/Properties/AssemblyInfo.cs b/CustomItems/Properties/AssemblyInfo.cs
@@ -38,5 +38,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.0.0")]
+[assembly: AssemblyVersion("6.0.1.0")]
+[assembly: AssemblyFileVersion("6.0.1.0")]