themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

FishOutNPC - Simplify bouncer logic. Fix check in event.

Browse source
This commit is contained in:
Patrikkk 2020-05-29 12:00:33 +02:00
parent 695ca52a9a
commit 47dd4a4345
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
TShockAPI/Bouncer.cs
View file

@ -2071,16 +2071,9 @@ namespace TShockAPI
/// <param name="args"></param>
internal void OnFishOutNPC(object sender, GetDataHandlers.FishOutNPCEventArgs args)
{
Projectile projectile = null;
foreach (var recentProjectile in args.Player.RecentlyCreatedProjectiles)
{
if (Main.projectile[recentProjectile.Index] != null && Main.projectile[recentProjectile.Index].Name == "Bobber")
{
projectile = Main.projectile[recentProjectile.Index];
break;
}
}
if (!FishingRodItemIDs.Contains(args.Player.SelectedItem.type) || projectile == null || !FishableNpcIDs.Contains(args.NpcID))
var projectile = args.Player.RecentlyCreatedProjectiles.FirstOrDefault(p => Main.projectile[p.Index] != null && Main.projectile[p.Index].Name == "Bobber");
if (!FishingRodItemIDs.Contains(args.Player.SelectedItem.type) || Main.projectile[projectile.Index] == null || !FishableNpcIDs.Contains(args.NpcID))
{
TShock.Log.ConsoleDebug("Bouncer / OnFishOutNPC rejected invalid NPC spawning from {0}", args.Player.Name);
args.Handled = true;

2
TShockAPI/GetDataHandlers.cs
View file

@ -1889,7 +1889,7 @@ namespace TShockAPI
public static HandlerList<FishOutNPCEventArgs> FishOutNPC = new HandlerList<FishOutNPCEventArgs>();
private static bool OnFishOutNPC(TSPlayer player, MemoryStream data, ushort tileX, ushort tileY, short npcID)
{
if (FoodPlatterTryPlacing == null)
if (FishOutNPC == null)
return false;
var args = new FishOutNPCEventArgs