Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better handling of usernames with periods (#1543)

Browse Source 
Fixes #1360
This commit is contained in:
Camotoy 2021-12-05 14:03:15 -05:00 committed by GitHub
parent 4b0998dbb7
commit 62a1006f02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/me/ryanhamshire/GriefPrevention/GriefPrevention.java
View File

@ -1526,12 +1526,6 @@ public class GriefPrevention extends JavaPlugin
//determine which claim the player is standing in //determine which claim the player is standing in
Claim claim = this.dataStore.getClaimAt(player.getLocation(), true /*ignore height*/, null); Claim claim = this.dataStore.getClaimAt(player.getLocation(), true /*ignore height*/, null);
//bracket any permissions
if (args[0].contains(".") && !args[0].startsWith("[") && !args[0].endsWith("]"))
{
args[0] = "[" + args[0] + "]";
}
//determine whether a single player or clearing permissions entirely //determine whether a single player or clearing permissions entirely
boolean clearPermissions = false; boolean clearPermissions = false;
OfflinePlayer otherPlayer = null; OfflinePlayer otherPlayer = null;
@ -1555,8 +1549,16 @@ public class GriefPrevention extends JavaPlugin
otherPlayer = this.resolvePlayerByName(args[0]); otherPlayer = this.resolvePlayerByName(args[0]);
if (!clearPermissions && otherPlayer == null && !args[0].equals("public")) if (!clearPermissions && otherPlayer == null && !args[0].equals("public"))
{ {
GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound2); //bracket any permissions - at this point it must be a permission without brackets
return true; if (args[0].contains("."))
{
args[0] = "[" + args[0] + "]";
}
else
{
GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound2);
return true;
}
} }
//correct to proper casing //correct to proper casing
@ -2949,20 +2951,22 @@ public class GriefPrevention extends JavaPlugin
return; return;
} }
} }
else if (recipientName.contains("."))
{
permission = recipientName;
}
else else
{ {
otherPlayer = this.resolvePlayerByName(recipientName); otherPlayer = this.resolvePlayerByName(recipientName);
if (otherPlayer == null && !recipientName.equals("public") && !recipientName.equals("all")) boolean isPermissionFormat = recipientName.contains(".");
if (otherPlayer == null && !recipientName.equals("public") && !recipientName.equals("all") && !isPermissionFormat)
{ {
GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound2); GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound2);
return; return;
} }
if (otherPlayer != null) if (otherPlayer == null && isPermissionFormat)
{
//player does not exist and argument has a period so this is a permission instead
permission = recipientName;
}
else if (otherPlayer != null)
{ {
recipientName = otherPlayer.getName(); recipientName = otherPlayer.getName();
recipientID = otherPlayer.getUniqueId(); recipientID = otherPlayer.getUniqueId();
@ -3029,6 +3033,8 @@ public class GriefPrevention extends JavaPlugin
if (permission != null) if (permission != null)
{ {
identifierToAdd = "[" + permission + "]"; identifierToAdd = "[" + permission + "]";
//replace recipientName as well so the success message clearly signals a permission
recipientName = identifierToAdd;
} }
else if (recipientID != null) else if (recipientID != null)
{ {