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

Merge branch 'general-devel' of github.com:TShock/TShock into general-devel

Browse source
This commit is contained in:
Zack Piispanen 2013-10-01 04:53:06 -04:00
commit 98a282cd2a
12 changed files with 164 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TShockAPI/TSPlayer.cs
View file

@ -310,6 +310,15 @@ namespace TShockAPI
set { Netplay.serverSock[Index].state = value; }
}
public string UUID
{
get {
return RealPlayer
? Netplay.serverSock[Index].clientUUID
: "";
}
}
public string IP
{
get
@ -500,7 +509,8 @@ namespace TShockAPI
(NPC.downedBoss2 ? BossFlags.DownedBoss2 : BossFlags.None) |
(NPC.downedBoss3 ? BossFlags.DownedBoss3 : BossFlags.None) |
(Main.hardMode ? BossFlags.HardMode : BossFlags.None) |
(NPC.downedClown ? BossFlags.DownedClown : BossFlags.None),
(NPC.downedClown ? BossFlags.DownedClown : BossFlags.None) |
(Main.ServerSideCharacter ? BossFlags.ServerSideCharacter : BossFlags.None),
BossFlags2 = (NPC.downedMechBoss1 ? BossFlags2.DownedMechBoss1 : BossFlags2.None) |
(NPC.downedMechBoss2 ? BossFlags2.DownedMechBoss2 : BossFlags2.None) |
(NPC.downedMechBoss3 ? BossFlags2.DownedMechBoss3 : BossFlags2.None) |