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

Fixes #1134 and #1131

Browse source
This commit is contained in:
White 2015-11-01 12:13:17 +10:30
parent 7e8f0ea8e4
commit 7d4a96cfee
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/Commands.cs
View file

@ -5028,7 +5028,7 @@ namespace TShockAPI
{ {
if (Main.npc[i].active && ((npcId == 0 && !Main.npc[i].townNPC && Main.npc[i].netID != NPCID.TargetDummy) || Main.npc[i].netID == npcId)) if (Main.npc[i].active && ((npcId == 0 && !Main.npc[i].townNPC && Main.npc[i].netID != NPCID.TargetDummy) || Main.npc[i].netID == npcId))
{ {
TSPlayer.Server.StrikeNPC(i, 99999, 0, 0); TSPlayer.Server.StrikeNPC(i, (int)(Main.npc[i].life + (Main.npc[i].defense*0.5)), 0, 0);
kills++; kills++;
} }
} }

3
TShockAPI/TSPlayer.cs
View file

@ -811,7 +811,8 @@ namespace TShockAPI
public virtual void SetTeam(int team) public virtual void SetTeam(int team)
{ {
Main.player[Index].team = team; Main.player[Index].team = team;
SendData(PacketTypes.PlayerTeam, "", Index); NetMessage.SendData((int)PacketTypes.PlayerTeam, -1, -1, "", Index);
NetMessage.SendData((int)PacketTypes.PlayerTeam, -1, Index, "", Index);
} }
private DateTime LastDisableNotification = DateTime.UtcNow; private DateTime LastDisableNotification = DateTime.UtcNow;