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

Browse source 
Conflicts:
	TShockAPI/Commands.cs
	TShockAPI/TSPlayer.cs
This commit is contained in:
high 2011-07-01 10:04:03 -04:00
commit bfd8ed5685
2 changed files with 41 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
TShockAPI/TSPlayer.cs
View file

@ -40,6 +40,7 @@ namespace TShockAPI
public bool InitSpawn = false;
public bool DisplayLogs = true;
public Vector2 oldSpawn = Vector2.Zero;
public TSPlayer LastWhisper;
public int LoginAttempts { get; set; }
public bool RealPlayer