Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion TShockAPI/Bouncer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3062,11 +3062,11 @@ internal void OnSecondUpdate()
{
Task.Run(() =>
{
var threshold = DateTime.UtcNow.AddSeconds(-5);
foreach (var player in TShock.Players)
{
if (player != null && player.TPlayer.whoAmI >= 0)
{
var threshold = DateTime.Now.AddSeconds(-5);
lock (player.RecentlyCreatedProjectiles)
{
player.RecentlyCreatedProjectiles = player.RecentlyCreatedProjectiles.Where(s => s.CreatedAt > threshold).ToList();
Expand Down
24 changes: 21 additions & 3 deletions TShockAPI/GetDataHandlers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3187,13 +3187,23 @@ private static bool HandleProjectileNew(GetDataHandlerArgs args)

lock (args.Player.RecentlyCreatedProjectiles)
{
if (!args.Player.RecentlyCreatedProjectiles.Any(p => p.Index == index))
bool alreadyTracked = false;
for (int i = 0; i < args.Player.RecentlyCreatedProjectiles.Count; i++)
{
if (args.Player.RecentlyCreatedProjectiles[i].Index == index)
{
alreadyTracked = true;
break;
}
}

if (!alreadyTracked)
{
args.Player.RecentlyCreatedProjectiles.Add(new GetDataHandlers.ProjectileStruct()
{
Index = index,
Type = type,
CreatedAt = DateTime.Now
CreatedAt = DateTime.UtcNow
});
}
}
Expand Down Expand Up @@ -3290,7 +3300,15 @@ private static bool HandleProjectileKill(GetDataHandlerArgs args)
args.Player.LastKilledProjectile = type;
lock (args.Player.RecentlyCreatedProjectiles)
{
args.Player.RecentlyCreatedProjectiles.ForEach(s => { if (s.Index == index) { s.Killed = true; } });
for (int i = 0; i < args.Player.RecentlyCreatedProjectiles.Count; i++)
{
if (args.Player.RecentlyCreatedProjectiles[i].Index != index)
continue;

var trackedProjectile = args.Player.RecentlyCreatedProjectiles[i];
trackedProjectile.Killed = true;
args.Player.RecentlyCreatedProjectiles[i] = trackedProjectile;
}
}

return false;
Expand Down
34 changes: 24 additions & 10 deletions TShockAPI/TShock.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1837,19 +1837,33 @@ private void NetHooks_SendData(SendDataEventArgs e)
var player = Players[projectile.owner];
if (player != null)
{
if (player.RecentlyCreatedProjectiles.Any(p => p.Index == e.number && p.Killed))
lock (player.RecentlyCreatedProjectiles)
{
player.RecentlyCreatedProjectiles.RemoveAll(p => p.Index == e.number && p.Killed);
}
bool foundActiveEntry = false;
for (int i = player.RecentlyCreatedProjectiles.Count - 1; i >= 0; i--)
{
var tracked = player.RecentlyCreatedProjectiles[i];
if (tracked.Index != e.number)
continue;

if (!player.RecentlyCreatedProjectiles.Any(p => p.Index == e.number))
{
player.RecentlyCreatedProjectiles.Add(new GetDataHandlers.ProjectileStruct()
if (tracked.Killed)
{
player.RecentlyCreatedProjectiles.RemoveAt(i);
continue;
}

foundActiveEntry = true;
}

if (!foundActiveEntry)
{
Index = e.number,
Type = (short)projectile.type,
CreatedAt = DateTime.Now
});
player.RecentlyCreatedProjectiles.Add(new GetDataHandlers.ProjectileStruct()
{
Index = e.number,
Type = (short)projectile.type,
CreatedAt = DateTime.UtcNow
});
}
}
}
}
Expand Down