Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Aura Development Team
AuraSudo
Commits
54e4891d
Verified
Commit
54e4891d
authored
Apr 21, 2021
by
Yannick Schinko
Browse files
Properly warn when no LP data could be loaded
parent
dcb968d6
Changes
2
Hide whitespace changes
Inline
Side-by-side
platform/common/gradle.properties
View file @
54e4891d
...
...
@@ -13,7 +13,7 @@ useRootValues=true
caffeine_version
=
2.8.0
configurate_version
=
3.6.1
adventure_version
=
4.4.0
luckPerms_version
=
5.
2
luckPerms_version
=
5.
3
multiPlatformCore_version
=
1.2.3.+
slf4j_version
=
1.7.25
...
...
platform/common/src/main/java/team/aura_dev/aurasudo/platform/common/player/PlayerDataCommon.java
View file @
54e4891d
package
team.aura_dev.aurasudo.platform.common.player
;
import
edu.umd.cs.findbugs.annotations.SuppressFBWarnings
;
import
java.util.Optional
;
import
java.util.UUID
;
import
javax.annotation.Nonnull
;
import
lombok.Data
;
...
...
@@ -13,6 +14,7 @@ import net.luckperms.api.LuckPermsProvider;
import
net.luckperms.api.model.user.User
;
import
team.aura_dev.aurasudo.api.AuraSudo
;
import
team.aura_dev.aurasudo.api.player.PlayerData
;
import
team.aura_dev.aurasudo.platform.common.AuraSudoBase
;
import
team.aura_dev.aurasudo.platform.common.permission.Permission
;
/**
...
...
@@ -64,18 +66,28 @@ public abstract class PlayerDataCommon implements PlayerData {
}
public
boolean
hasPermission
(
Permission
permission
)
{
final
User
user
=
luckPerms
.
getUserManager
().
getUser
(
uuid
);
// Shouldn't happen, but let's essentially just ignore this instead of throwing exceptions
if
(
user
==
null
)
return
false
;
return
user
.
getCachedData
()
.
getPermissionData
()
.
checkPermission
(
permission
.
getPermission
())
.
asBoolean
();
return
getLuckPermsUser
()
.
map
(
user
->
user
.
getCachedData
()
.
getPermissionData
()
.
checkPermission
(
permission
.
getPermission
())
.
asBoolean
())
.
orElse
(
false
);
}
public
abstract
void
sendMessage
(
TextComponent
message
);
protected
abstract
Object
getNativePlayer
();
protected
final
Optional
<
User
>
getLuckPermsUser
()
{
final
User
user
=
luckPerms
.
getUserManager
().
getUser
(
uuid
);
// Shouldn't happen
if
(
user
==
null
)
{
AuraSudoBase
.
logger
.
warn
(
"LuckPerms had no data loaded for UUID "
+
uuid
);
}
return
Optional
.
ofNullable
(
user
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment