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

Fix false cheat catch on stab items.

Browse source 
Stab items (swords) now send projectiles to imitate directional stabbing. Bouncer catched since there was no handling of these new projectiles.
This commit is contained in:
Patrikkk 2020-05-18 02:37:39 +02:00
parent a02f959f58
commit 91e3ebf4f0
1 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

24
TShockAPI/Bouncer.cs
View file

@ -796,6 +796,17 @@ namespace TShockAPI
return;
}
if (stabProjectile.ContainsKey(type))
{
if (stabProjectile.Values.Any(t => t == args.Player.TPlayer.HeldItem.type))
{
args.Handled = false;
return;
}
}
// Main.projHostile contains projectiles that can harm players
// without PvP enabled and belong to enemy mobs, so they shouldn't be
// possible for players to create. (Source: Ijwu, QuiCM)
@ -1922,5 +1933,18 @@ namespace TShockAPI
TileID.Campfire
};
private static Dictionary<int, int> stabProjectile = new Dictionary<int, int>()
{
{ ProjectileID.GladiusStab, ItemID.Gladius },
{ ProjectileID.RulerStab, ItemID.Ruler },
{ ProjectileID.CopperShortswordStab, ItemID.CopperShortsword },
{ ProjectileID.TinShortswordStab, ItemID.TinShortsword },
{ ProjectileID.IronShortswordStab, ItemID.IronShortsword },
{ ProjectileID.LeadShortswordStab, ItemID.LeadShortsword },
{ ProjectileID.SilverShortswordStab, ItemID.SilverShortsword },
{ ProjectileID.TungstenShortswordStab, ItemID.TungstenShortsword },
{ ProjectileID.GoldShortswordStab, ItemID.GoldShortsword },
{ ProjectileID.PlatinumShortswordStab, ItemID.PlatinumShortsword }
};
}
}