Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-17 09:25:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development

Browse Source
This commit is contained in:
Melledy
2022-05-14 06:35:37 -07:00
parent 248b655f07 741e5749ad
commit a751e71da9
11 changed files with 207 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/emu/grasscutter/game/Account.java
View File

@@ -144,16 +144,17 @@ public class Account {
}
public boolean hasPermission(String permission) {
if (this.permissions.contains(permission) || this.permissions.contains("*")) {
return true;
}
if (this.permissions.contains(permission)) return true;
if(this.permissions.contains("*") && this.permissions.size() == 1) return true;
String[] permissionParts = permission.split("\\.");
for (String p : this.permissions) {
if (permissionMatchesWildcard(p, permissionParts)) {
return true;
}
if (p.startsWith("-") && permissionMatchesWildcard(p.substring(1), permissionParts)) return false;
if (permissionMatchesWildcard(p, permissionParts)) return true;
}
return false;
return this.permissions.contains("*");
}
public boolean removePermission(String permission) {