From f31fda2e16c4e9f03ce2ed160d0f46fcf5e50e8f Mon Sep 17 00:00:00 2001 From: lhhxxxxx <91231470+lhhxxxxx@users.noreply.github.com> Date: Wed, 27 Apr 2022 14:45:53 +0800 Subject: [PATCH] Update Account.hasPermission() Add wildcard characters to permission nodes under the same namespace. (simple implementation) --- src/main/java/emu/grasscutter/game/Account.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/emu/grasscutter/game/Account.java b/src/main/java/emu/grasscutter/game/Account.java index dbd6ef854..7ccaf7e7e 100644 --- a/src/main/java/emu/grasscutter/game/Account.java +++ b/src/main/java/emu/grasscutter/game/Account.java @@ -104,7 +104,10 @@ public class Account { } public boolean hasPermission(String permission) { - return this.permissions.contains(permission) || this.permissions.contains("*") ? true : false; + return this.permissions.contains(permission) || + this.permissions.contains("*") || + (this.permissions.contains("player") || this.permissions.contains("player.*")) && permission.startsWith("player.") || + (this.permissions.contains("server") || this.permissions.contains("server.*")) && permission.startsWith("server."); } public boolean removePermission(String permission) {