Resolved merge conflicts on sundial-permission

This commit is contained in:
White 2016-07-28 11:20:37 +09:30
commit b2bd40b8f2
2 changed files with 12 additions and 4 deletions

View file

@ -3515,6 +3515,12 @@ namespace TShockAPI
return true;
}
if (type == 3 & !args.Player.HasPermission(Permissions.usesundial))
{
args.Player.SendErrorMessage("You do not have permission to use the Enchanted Sundial!");
return true;
}
return false;
}