Skip to content

[fix/perf] Harden LandGolfBallInCup projectile validation #3232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Xekep wants to merge 1 commit into
base: general-devel
Choose a base branch
from
Open

[fix/perf] Harden LandGolfBallInCup projectile validation #3232

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 17 additions & 3 deletions TShockAPI/Handlers/LandGolfBallInCupHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public void OnReceive(object sender, LandGolfBallInCupEventArgs args)
return;
}

if (!Main.tile[args.TileX, args.TileY].active() && Main.tile[args.TileX, args.TileY].type != TileID.GolfHole)
if (!Main.tile[args.TileX, args.TileY].active() || Main.tile[args.TileX, args.TileY].type != TileID.GolfHole)
{
TShock.Log.ConsoleDebug(GetString($"LandGolfBallInCupHandler: Tile at packet position X:{args.TileX} Y:{args.TileY} is not a golf hole! - From {args.Player.Name}"));
args.Handled = true;
Expand All @@ -116,8 +116,22 @@ public void OnReceive(object sender, LandGolfBallInCupEventArgs args)
return;
}

var usedGolfBall = args.Player.RecentlyCreatedProjectiles.Any(e => GolfBallProjectileIDs.Contains(e.Type));
var usedGolfClub = args.Player.RecentlyCreatedProjectiles.Any(e => e.Type == ProjectileID.GolfClubHelper);
var usedGolfBall = false;
var usedGolfClub = false;
lock (args.Player.RecentlyCreatedProjectiles)
{
for (int i = 0; i < args.Player.RecentlyCreatedProjectiles.Count; i++)
{
var tracked = args.Player.RecentlyCreatedProjectiles[i];
if (!usedGolfBall && GolfBallProjectileIDs.Contains(tracked.Type))
usedGolfBall = true;
if (!usedGolfClub && tracked.Type == ProjectileID.GolfClubHelper)
usedGolfClub = true;
if (usedGolfBall && usedGolfClub)
break;
}
}

if (!usedGolfClub && !usedGolfBall)
{
TShock.Log.ConsoleDebug(GetString($"GolfPacketHandler: Player did not have create a golf club projectile the last 5 seconds! - From {args.Player.Name}"));
Expand Down