Fixed merge

This commit is contained in:
Maverick Motherfucker 2011-06-03 19:57:58 -07:00
commit bdd55a4d06
9 changed files with 120 additions and 36 deletions

View file

@ -8,8 +8,8 @@ namespace TShockAPI
public class TSPlayer
{
public uint tileThreshold;
public bool firstTimeHealth;
public bool firstTimeMana;
public bool syncHP = false;
public bool syncMP = false;
private int player;
private bool admin;