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

Merge branch 'general-devel' into h/ips

Browse source
This commit is contained in:
Lucas Nicodemus 2021-05-28 19:36:25 -07:00
commit 5e09f5133d
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/Bouncer.cs
View file

@ -1541,7 +1541,7 @@ namespace TShockAPI
if (npc.townNPC && npc.netID != NPCID.Guide && npc.netID != NPCID.Clothier)
{
if (type != BuffID.Lovestruck && type != BuffID.Stinky && type != BuffID.DryadsWard &&
type != BuffID.Wet && type != BuffID.Slimed && type != BuffID.GelBalloonBuff)
type != BuffID.Wet && type != BuffID.Slimed && type != BuffID.GelBalloonBuff && type != BuffID.Frostburn2)
{
detectedNPCBuffTimeCheat = true;
}
@ -1554,8 +1554,8 @@ namespace TShockAPI
if (detectedNPCBuffTimeCheat)
{
TShock.Log.ConsoleDebug("Bouncer / OnNPCAddBuff rejected abnormal buff ({1}) from {0}", args.Player.Name, type);
args.Player.Kick($"Added buff to NPC abnormally.", true);
TShock.Log.ConsoleDebug("Bouncer / OnNPCAddBuff rejected abnormal buff ({0}) added to {1} ({2}) from {3}.", type, npc.TypeName, npc.netID, args.Player.Name);
args.Player.Kick($"Added buff to {npc.TypeName} NPC abnormally.", true);
args.Handled = true;
}
}