Skip to content

Commit b5183e6

Browse files
committed
fixing up implosion grenades
1 parent f7a5a63 commit b5183e6

File tree

3 files changed

+4
-18
lines changed

3 files changed

+4
-18
lines changed

CustomItems/Items/ImplosionGrenade.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ protected override void OnExploding(ExplodingGrenadeEventArgs ev)
147147

148148
bool line = Physics.Linecast(ev.Grenade.transform.position, player.Position, layerMask);
149149
Log.Debug($"{player.Nickname} - {line}", CustomItems.Instance.Config.IsDebugEnabled);
150-
if (!line)
150+
if (line)
151151
{
152152
effectedPlayers.Add(player);
153153
Coroutines.Add(Timing.RunCoroutine(DoSuction(player, ev.Grenade.transform.position + (Vector3.up * 1.5f))));

CustomItems/Items/LuckyCoin.cs

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ namespace CustomItems.Items
2424
/// <inheritdoc />
2525
public class LuckyCoin : CustomItem
2626
{
27-
private readonly List<PocketDimensionTeleport> teleports = new List<PocketDimensionTeleport>();
2827
private bool isDropped;
2928
private bool onCooldown;
3029

@@ -68,15 +67,13 @@ public class LuckyCoin : CustomItem
6867
/// <inheritdoc/>
6968
protected override void SubscribeEvents()
7069
{
71-
Server.RoundStarted += OnRoundStart;
7270
Player.EnteringPocketDimension += OnEnterPocketDimension;
7371
base.SubscribeEvents();
7472
}
7573

7674
/// <inheritdoc/>
7775
protected override void UnsubscribeEvents()
7876
{
79-
Server.RoundStarted -= OnRoundStart;
8077
Player.EnteringPocketDimension -= OnEnterPocketDimension;
8178
base.UnsubscribeEvents();
8279
}
@@ -109,17 +106,6 @@ protected override void OnDropping(DroppingItemEventArgs ev)
109106
}
110107
}
111108

112-
private void OnRoundStart()
113-
{
114-
teleports.Clear();
115-
116-
foreach (PocketDimensionTeleport teleport in Object.FindObjectsOfType<PocketDimensionTeleport>())
117-
{
118-
teleports.Add(teleport);
119-
Log.Debug("Adding PD Teleport..", CustomItems.Instance.Config.IsDebugEnabled);
120-
}
121-
}
122-
123109
private void OnEnterPocketDimension(EnteringPocketDimensionEventArgs ev)
124110
{
125111
Log.Debug($"{ev.Player.Nickname} Entering Pocket Dimension.", CustomItems.Instance.Config.IsDebugEnabled);
@@ -133,7 +119,7 @@ private void OnEnterPocketDimension(EnteringPocketDimensionEventArgs ev)
133119
return;
134120

135121
Log.Debug($"{ev.Player.Nickname} - EPD checks passed.", CustomItems.Instance.Config.IsDebugEnabled);
136-
foreach (PocketDimensionTeleport teleport in teleports)
122+
foreach (PocketDimensionTeleport teleport in Map.PocketDimensionTeleports)
137123
{
138124
Log.Debug($"{ev.Player.Nickname} - Checking teleporter..", CustomItems.Instance.Config.IsDebugEnabled);
139125
if (teleport._type != PocketDimensionTeleport.PDTeleportType.Exit)

CustomItems/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@
3838
// You can specify all the values or you can default the Build and Revision Numbers
3939
// by using the '*' as shown below:
4040
// [assembly: AssemblyVersion("1.0.*")]
41-
[assembly: AssemblyVersion("6.0.0.0")]
42-
[assembly: AssemblyFileVersion("6.0.0.0")]
41+
[assembly: AssemblyVersion("6.0.1.0")]
42+
[assembly: AssemblyFileVersion("6.0.1.0")]

0 commit comments

Comments
 (0)