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

callerIsEffectiveRoot -> callerIsServerConsole in ban system

Browse source 
This code clarity improvement helps make the code base clearer.

Thanks @deadsurgeon42
This commit is contained in:
Lucas Nicodemus 2017-12-03 09:49:45 -07:00
parent 39733a116d
commit 3204ef2a83
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
TShockAPI/Commands.cs
View file

@ -1305,15 +1305,13 @@ namespace TShockAPI
List<TSPlayer> players = TShock.Utils.FindPlayer(args.Parameters[1]); List<TSPlayer> players = TShock.Utils.FindPlayer(args.Parameters[1]);
User offlineUser = TShock.Users.GetUserByName(args.Parameters[1]); User offlineUser = TShock.Users.GetUserByName(args.Parameters[1]);
// Determines if the caller is effective root for overriding permissions // Storage variable to determine if the command executor is the server console
bool callerIsEffectiveRoot = false; // If it is, we assume they have full control and let them override permission checks
bool callerIsServerConsole = false;
// A ban source is effective root if they are not not real and not rest if (args.Player is TSServerPlayer)
// Super admins ingame who attempt to run this will have to remove
// the immune to ban permission if they want to ban an immune player
if (!(args.Player is TSRestPlayer) && !args.Player.RealPlayer)
{ {
callerIsEffectiveRoot = true; callerIsServerConsole = true;
} }
// The ban reason the ban is going to have // The ban reason the ban is going to have
@ -1360,7 +1358,7 @@ namespace TShockAPI
{ {
TSPlayer target = players[0]; TSPlayer target = players[0];
if (target.HasPermission(Permissions.immunetoban) && !callerIsEffectiveRoot) if (target.HasPermission(Permissions.immunetoban) && !callerIsServerConsole)
{ {
args.Player.SendErrorMessage("Permission denied. Target {0} is immune to ban.", target.Name); args.Player.SendErrorMessage("Permission denied. Target {0} is immune to ban.", target.Name);
return; return;
@ -1430,7 +1428,7 @@ namespace TShockAPI
targetGeneralizedName = offlineUser.Name; targetGeneralizedName = offlineUser.Name;
if (TShock.Groups.GetGroupByName(offlineUser.Group).HasPermission(Permissions.immunetoban) && if (TShock.Groups.GetGroupByName(offlineUser.Group).HasPermission(Permissions.immunetoban) &&
!callerIsEffectiveRoot) !callerIsServerConsole)
{ {
args.Player.SendErrorMessage("Permission denied. Target {0} is immune to ban.", targetGeneralizedName); args.Player.SendErrorMessage("Permission denied. Target {0} is immune to ban.", targetGeneralizedName);
return; return;