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

Standardize permission rejection messages

Browse source
This commit is contained in:
Chris 2020-06-02 10:18:40 +09:30
parent c5fcece18d
commit d46f534533
3 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/Commands.cs
View file

@ -1987,7 +1987,7 @@ namespace TShockAPI
void FailedPermissionCheck() void FailedPermissionCheck()
{ {
args.Player.SendErrorMessage("You do not have sufficient permissions to start the {0} event.", eventType); args.Player.SendErrorMessage("You do not have permission to start the {0} event.", eventType);
return; return;
} }
@ -4873,7 +4873,7 @@ namespace TShockAPI
{ {
if (!args.Player.HasPermission(Permissions.tp)) if (!args.Player.HasPermission(Permissions.tp))
{ {
args.Player.SendErrorMessage("You don't have the necessary permission to do that."); args.Player.SendErrorMessage("You do not have permission to teleport.");
break; break;
} }
if (args.Parameters.Count <= 1) if (args.Parameters.Count <= 1)
@ -5051,7 +5051,7 @@ namespace TShockAPI
} }
if (displayIdsRequested && !args.Player.HasPermission(Permissions.seeids)) if (displayIdsRequested && !args.Player.HasPermission(Permissions.seeids))
{ {
args.Player.SendErrorMessage("You don't have the required permission to list player ids."); args.Player.SendErrorMessage("You do not have permission to list player ids.");
return; return;
} }
@ -6025,7 +6025,7 @@ namespace TShockAPI
{ {
if (!args.Player.HasPermission(Permissions.godmodeother)) if (!args.Player.HasPermission(Permissions.godmodeother))
{ {
args.Player.SendErrorMessage("You do not have permission to god mode another player!"); args.Player.SendErrorMessage("You do not have permission to god mode another player.");
return; return;
} }
string plStr = String.Join(" ", args.Parameters); string plStr = String.Join(" ", args.Parameters);

32
TShockAPI/GetDataHandlers.cs
View file

@ -2928,21 +2928,21 @@ namespace TShockAPI
if (bosses.Contains(thingType) && !args.Player.HasPermission(Permissions.summonboss)) if (bosses.Contains(thingType) && !args.Player.HasPermission(Permissions.summonboss))
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawnBoss rejected boss {0} {1}", args.Player.Name, thingType); TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawnBoss rejected boss {0} {1}", args.Player.Name, thingType);
args.Player.SendErrorMessage("You don't have permission to summon a boss."); args.Player.SendErrorMessage("You do not have permission to summon a boss.");
return true; return true;
} }
if (invasions.Contains(thingType) && !args.Player.HasPermission(Permissions.startinvasion)) if (invasions.Contains(thingType) && !args.Player.HasPermission(Permissions.startinvasion))
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawnBoss rejected invasion {0} {1}", args.Player.Name, thingType); TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawnBoss rejected invasion {0} {1}", args.Player.Name, thingType);
args.Player.SendErrorMessage("You don't have permission to start an invasion."); args.Player.SendErrorMessage("You do not have permission to start an invasion.");
return true; return true;
} }
if (pets.Contains(thingType) && !args.Player.HasPermission(Permissions.spawnpets)) if (pets.Contains(thingType) && !args.Player.HasPermission(Permissions.spawnpets))
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawnBoss rejected pet {0} {1}", args.Player.Name, thingType); TShock.Log.ConsoleDebug("GetDataHandlers / HandleSpawnBoss rejected pet {0} {1}", args.Player.Name, thingType);
args.Player.SendErrorMessage("You don't have permission to spawn pets."); args.Player.SendErrorMessage("You do not have permission to spawn pets.");
return true; return true;
} }
@ -3234,7 +3234,7 @@ namespace TShockAPI
{ {
if (!args.Player.HasPermission(Permissions.journey_timefreeze)) if (!args.Player.HasPermission(Permissions.journey_timefreeze))
{ {
args.Player.SendErrorMessage("You don't have permission to freeze the time of the server!"); args.Player.SendErrorMessage("You do not have permission to freeze the time of the server.");
return true; return true;
} }
break; break;
@ -3246,7 +3246,7 @@ namespace TShockAPI
{ {
if (!args.Player.HasPermission(Permissions.journey_timeset)) if (!args.Player.HasPermission(Permissions.journey_timeset))
{ {
args.Player.SendErrorMessage("You don't have permission to modify the time of the server!"); args.Player.SendErrorMessage("You don't have permission to modify the time of the server.");
return true; return true;
} }
break; break;
@ -3255,7 +3255,7 @@ namespace TShockAPI
{ {
if (!args.Player.HasPermission(Permissions.journey_godmode)) if (!args.Player.HasPermission(Permissions.journey_godmode))
{ {
args.Player.SendErrorMessage("You don't have permission to toggle godmode!"); args.Player.SendErrorMessage("You do not have permission to toggle godmode.");
return true; return true;
} }
break; break;
@ -3264,7 +3264,7 @@ namespace TShockAPI
{ {
if (!args.Player.HasPermission(Permissions.journey_windstrength)) if (!args.Player.HasPermission(Permissions.journey_windstrength))
{ {
args.Player.SendErrorMessage("You don't have permission to modify the wind strength of the server!"); args.Player.SendErrorMessage("You do not have permission to modify the wind strength of the server.");
return true; return true;
} }
break; break;
@ -3273,7 +3273,7 @@ namespace TShockAPI
{ {
if (!args.Player.HasPermission(Permissions.journey_rainstrength)) if (!args.Player.HasPermission(Permissions.journey_rainstrength))
{ {
args.Player.SendErrorMessage("You don't have permission to modify the rain strength of the server!"); args.Player.SendErrorMessage("You do not have permission to modify the rain strength of the server.");
return true; return true;
} }
break; break;
@ -3282,7 +3282,7 @@ namespace TShockAPI
{ {
if (!args.Player.HasPermission(Permissions.journey_timespeed)) if (!args.Player.HasPermission(Permissions.journey_timespeed))
{ {
args.Player.SendErrorMessage("You don't have permission to modify the time speed of the server!"); args.Player.SendErrorMessage("You do not have permission to modify the time speed of the server.");
return true; return true;
} }
break; break;
@ -3291,7 +3291,7 @@ namespace TShockAPI
{ {
if (!args.Player.HasPermission(Permissions.journey_rainfreeze)) if (!args.Player.HasPermission(Permissions.journey_rainfreeze))
{ {
args.Player.SendErrorMessage("You don't have permission to freeze the rain strength of the server!"); args.Player.SendErrorMessage("You do not have permission to freeze the rain strength of the server.");
return true; return true;
} }
break; break;
@ -3300,7 +3300,7 @@ namespace TShockAPI
{ {
if (!args.Player.HasPermission(Permissions.journey_windfreeze)) if (!args.Player.HasPermission(Permissions.journey_windfreeze))
{ {
args.Player.SendErrorMessage("You don't have permission to freeze the wind strength of the server!"); args.Player.SendErrorMessage("You do not have permission to freeze the wind strength of the server.");
return true; return true;
} }
break; break;
@ -3309,7 +3309,7 @@ namespace TShockAPI
{ {
if (!args.Player.HasPermission(Permissions.journey_placementrange)) if (!args.Player.HasPermission(Permissions.journey_placementrange))
{ {
args.Player.SendErrorMessage("You don't have permission to modify the tile placement range of your character!"); args.Player.SendErrorMessage("You do not have permission to modify the tile placement range of your character.");
return true; return true;
} }
break; break;
@ -3318,7 +3318,7 @@ namespace TShockAPI
{ {
if (!args.Player.HasPermission(Permissions.journey_setdifficulty)) if (!args.Player.HasPermission(Permissions.journey_setdifficulty))
{ {
args.Player.SendErrorMessage("You don't have permission to modify the world difficulty of the server!"); args.Player.SendErrorMessage("You do not have permission to modify the world difficulty of the server.");
return true; return true;
} }
break; break;
@ -3327,7 +3327,7 @@ namespace TShockAPI
{ {
if (!args.Player.HasPermission(Permissions.journey_biomespreadfreeze)) if (!args.Player.HasPermission(Permissions.journey_biomespreadfreeze))
{ {
args.Player.SendErrorMessage("You don't have permission to freeze the biome spread of the server!"); args.Player.SendErrorMessage("You do not have permission to freeze the biome spread of the server.");
return true; return true;
} }
break; break;
@ -3342,7 +3342,7 @@ namespace TShockAPI
} }
if (!args.Player.HasPermission(Permissions.journey_setspawnrate)) if (!args.Player.HasPermission(Permissions.journey_setspawnrate))
{ {
args.Player.SendErrorMessage("You don't have permission to modify the NPC spawn rate of the server!"); args.Player.SendErrorMessage("You do not have permission to modify the NPC spawn rate of the server.");
return true; return true;
} }
break; break;
@ -3576,7 +3576,7 @@ namespace TShockAPI
if (!args.Player.HasPermission(Permissions.startdd2)) if (!args.Player.HasPermission(Permissions.startdd2))
{ {
TShock.Log.ConsoleDebug("GetDataHandlers / HandleOldOnesArmy rejected permissions {0}", args.Player.Name); TShock.Log.ConsoleDebug("GetDataHandlers / HandleOldOnesArmy rejected permissions {0}", args.Player.Name);
args.Player.SendErrorMessage("You don't have permission to start the Old One's Army event."); args.Player.SendErrorMessage("You do not have permission to start the Old One's Army event.");
return true; return true;
} }

6
TShockAPI/TSPlayer.cs
View file

@ -664,13 +664,13 @@ namespace TShockAPI
switch (failure) switch (failure)
{ {
case BuildPermissionFailPoint.GeneralBuild: case BuildPermissionFailPoint.GeneralBuild:
SendErrorMessage("You lack permission to build on this server."); SendErrorMessage("You do not have permission to build on this server.");
break; break;
case BuildPermissionFailPoint.SpawnProtect: case BuildPermissionFailPoint.SpawnProtect:
SendErrorMessage("You lack permission to build in the spawn point."); SendErrorMessage("You do not have permission to build in the spawn point.");
break; break;
case BuildPermissionFailPoint.Regions: case BuildPermissionFailPoint.Regions:
SendErrorMessage("You lack permission to build in this region."); SendErrorMessage("You do not have permission to build in this region.");
break; break;
} }