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

Fixes #1248

Browse source
This commit is contained in:
ProfessorXZ 2016-07-28 10:14:17 +02:00
parent fb6d88819d
commit e3df970c50
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
TShockAPI/GetDataHandlers.cs
View file

@ -1251,6 +1251,7 @@ namespace TShockAPI
{ PacketTypes.NumberOfAnglerQuestsCompleted, HandleNumberOfAnglerQuestsCompleted }, { PacketTypes.NumberOfAnglerQuestsCompleted, HandleNumberOfAnglerQuestsCompleted },
{ PacketTypes.MassWireOperation, HandleMassWireOperation }, { PacketTypes.MassWireOperation, HandleMassWireOperation },
{ PacketTypes.GemLockToggle, HandleGemLockToggle }, { PacketTypes.GemLockToggle, HandleGemLockToggle },
{ PacketTypes.CatchNPC, HandleCatchNpc },
{ PacketTypes.ToggleParty, HandleToggleParty } { PacketTypes.ToggleParty, HandleToggleParty }
}; };
} }
@ -4001,6 +4002,21 @@ namespace TShockAPI
return false; return false;
} }
private static bool HandleCatchNpc(GetDataHandlerArgs args)
{
var npcID = args.Data.ReadInt16();
var who = args.Data.ReadByte();
if (Main.npc[npcID]?.catchItem == 0)
{
Main.npc[npcID].active = true;
NetMessage.SendData(23, -1, -1, "", npcID);
return true;
}
return false;
}
private static bool HandleToggleParty(GetDataHandlerArgs args) private static bool HandleToggleParty(GetDataHandlerArgs args)
{ {
if (args.Player != null && !args.Player.HasPermission(Permissions.toggleparty)) if (args.Player != null && !args.Player.HasPermission(Permissions.toggleparty))