Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-07-08 04:24:50 +02:00
Code Issues Projects Releases Wiki Activity

Make Sponge's #getFriendlyIdentifier return usernames of Users and display names of Groups (#412)

Browse Source
This commit is contained in:
Luck 2017-08-03 18:39:39 +01:00
parent 3d2115ff3c
commit 5784458d03
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java
View File

@ -153,6 +153,11 @@ public class SubjectProxy implements Subject {
return ref.getSubjectIdentifier();
}
@Override
public Optional<String> getFriendlyIdentifier() {
return getHandle().thenApply(LPSubject::getFriendlyIdentifier).join();
}
@Override
public Set<Context> getActiveContexts() {
return getHandle().thenApply(handle -> CompatibilityUtil.convertContexts(handle.getActiveContextSet())).join();

3
sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeGroup.java
View File

@ -150,7 +150,8 @@ public class SpongeGroup extends Group {
@Override
public Optional<String> getFriendlyIdentifier() {
return Optional.of(parent.getFriendlyName());
String rawDisplayName = parent.getRawDisplayName();
return rawDisplayName.equals(getIdentifier()) ? Optional.empty() : Optional.of(rawDisplayName);
}
@Override

5
sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeUser.java
View File

@ -94,6 +94,11 @@ public class SpongeUser extends User {
return plugin.getUuidCache().getExternalUUID(parent.getUuid()).toString();
}
@Override
public Optional<String> getFriendlyIdentifier() {
return parent.getName();
}
@Override
public Optional<CommandSource> getCommandSource() {
final UUID uuid = plugin.getUuidCache().getExternalUUID(parent.getUuid());