Merged branch master into master

This commit is contained in:
juanjp600
2016-08-29 17:55:46 -03:00
5 changed files with 31 additions and 10 deletions

View File

@@ -125,8 +125,8 @@ namespace Barotrauma.Networking
}
public bool HasPermission(ClientPermissions permission)
{
return Permissions.HasFlag(permission);
{
return false; //Permissions.HasFlag(permission);
}
public T GetVote<T>(VoteType voteType)

View File

@@ -832,8 +832,8 @@ namespace Barotrauma.Networking
}
public bool HasPermission(ClientPermissions permission)
{
return permissions.HasFlag(permission);
{
return false;// permissions.HasFlag(permission);
}
public override void Draw(Microsoft.Xna.Framework.Graphics.SpriteBatch spriteBatch)