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

More whoops moments k0rd didnt find for me.

Browse source 
Updated the Server bin.
This commit is contained in:
Zack Piispanen 2013-09-30 01:33:07 -04:00
parent 7ea9be6e75
commit 6185559c6a
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TShockAPI/TSPlayer.cs
View file

@ -574,7 +574,7 @@ namespace TShockAPI
m_y=Main.maxTilesY - size; m_y=Main.maxTilesY - size;
} }
//SendData(PacketTypes.TileSendSquare, "", size, m_x, m_y); SendData(PacketTypes.TileSendSquare, "", size, m_x, m_y);
return true; return true;
} }
catch (IndexOutOfRangeException) catch (IndexOutOfRangeException)
@ -678,14 +678,14 @@ namespace TShockAPI
public virtual void DamagePlayer(int damage) public virtual void DamagePlayer(int damage)
{ {
//NetMessage.SendData((int) PacketTypes.PlayerDamage, -1, -1, "", Index, ((new Random()).Next(-1, 1)), damage, NetMessage.SendData((int) PacketTypes.PlayerDamage, -1, -1, "", Index, ((new Random()).Next(-1, 1)), damage,
// (float) 0); (float) 0);
} }
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); SendData(PacketTypes.PlayerTeam, "", Index);
} }
public virtual void Disable(string reason = "") public virtual void Disable(string reason = "")
@ -712,7 +712,7 @@ namespace TShockAPI
SendMessage("You are now being annoyed.", Color.Red); SendMessage("You are now being annoyed.", Color.Red);
while ((DateTime.UtcNow - launch).TotalSeconds < time2 && startname == Name) while ((DateTime.UtcNow - launch).TotalSeconds < time2 && startname == Name)
{ {
//SendData(PacketTypes.NpcSpecial, number: Index, number2: 2f); SendData(PacketTypes.NpcSpecial, number: Index, number2: 2f);
Thread.Sleep(50); Thread.Sleep(50);
} }
} }
@ -722,7 +722,7 @@ namespace TShockAPI
if ((DateTime.UtcNow - LastThreat).TotalMilliseconds < 5000 && !bypass) if ((DateTime.UtcNow - LastThreat).TotalMilliseconds < 5000 && !bypass)
return; return;
//SendData(PacketTypes.PlayerAddBuff, number: Index, number2: type, number3: time); SendData(PacketTypes.PlayerAddBuff, number: Index, number2: type, number3: time);
} }
//Todo: Separate this into a few functions. SendTo, SendToAll, etc //Todo: Separate this into a few functions. SendTo, SendToAll, etc

BIN
TerrariaServerBins/TerrariaServer.exe
View file

Binary file not shown.