Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-24 11:38:40 +01:00
Code Issues Projects Releases Wiki Activity

More context performance improvements (#3209)

Browse Source
This commit is contained in:
Luck 2021-11-18 18:21:30 +00:00
parent c9d4c7dac7
commit 272d289d4a
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java
View File

@ -47,6 +47,7 @@ import me.lucko.luckperms.common.util.Uuids;
import me.lucko.luckperms.common.verbose.event.MetaCheckEvent; import me.lucko.luckperms.common.verbose.event.MetaCheckEvent;
import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent; import me.lucko.luckperms.common.verbose.event.PermissionCheckEvent;
import net.luckperms.api.context.ContextSet;
import net.luckperms.api.context.DefaultContextKeys; import net.luckperms.api.context.DefaultContextKeys;
import net.luckperms.api.context.MutableContextSet; import net.luckperms.api.context.MutableContextSet;
import net.luckperms.api.model.data.DataType; import net.luckperms.api.model.data.DataType;
@ -332,13 +333,13 @@ public class LuckPermsVaultPermission extends AbstractVaultPermission {
// utility method for getting a contexts instance for a given vault lookup. // utility method for getting a contexts instance for a given vault lookup.
QueryOptions getQueryOptions(@Nullable UUID uuid, @Nullable String world) { QueryOptions getQueryOptions(@Nullable UUID uuid, @Nullable String world) {
MutableContextSet context; ContextSet context;
Player player = Optional.ofNullable(uuid).flatMap(u -> this.plugin.getBootstrap().getPlayer(u)).orElse(null); Player player = Optional.ofNullable(uuid).flatMap(u -> this.plugin.getBootstrap().getPlayer(u)).orElse(null);
if (player != null) { if (player != null) {
context = this.plugin.getContextManager().getContext(player).mutableCopy(); context = this.plugin.getContextManager().getContext(player);
} else { } else {
context = this.plugin.getContextManager().getStaticContext().mutableCopy(); context = this.plugin.getContextManager().getStaticContext();
} }
String playerWorld = player == null ? null : player.getWorld().getName(); String playerWorld = player == null ? null : player.getWorld().getName();
@ -346,20 +347,26 @@ public class LuckPermsVaultPermission extends AbstractVaultPermission {
// if world is null, we want to do a lookup in the players current context // if world is null, we want to do a lookup in the players current context
// if world is not null, we want to do a lookup in that specific world // if world is not null, we want to do a lookup in that specific world
if (world != null && !world.isEmpty() && !world.equalsIgnoreCase(playerWorld)) { if (world != null && !world.isEmpty() && !world.equalsIgnoreCase(playerWorld)) {
MutableContextSet mutContext = context.mutableCopy();
context = mutContext;
// remove already accumulated worlds // remove already accumulated worlds
context.removeAll(DefaultContextKeys.WORLD_KEY); mutContext.removeAll(DefaultContextKeys.WORLD_KEY);
// add the vault world // add the vault world
context.add(DefaultContextKeys.WORLD_KEY, world.toLowerCase(Locale.ROOT)); mutContext.add(DefaultContextKeys.WORLD_KEY, world.toLowerCase(Locale.ROOT));
} }
// if we're using a special vault server // if we're using a special vault server
if (useVaultServer()) { if (useVaultServer()) {
MutableContextSet mutContext = context instanceof MutableContextSet ? (MutableContextSet) context : context.mutableCopy();
context = mutContext;
// remove the normal server context from the set // remove the normal server context from the set
context.remove(DefaultContextKeys.SERVER_KEY, getServer()); mutContext.remove(DefaultContextKeys.SERVER_KEY, getServer());
// add the vault specific server // add the vault specific server
if (!getVaultServer().equals("global")) { if (!getVaultServer().equals("global")) {
context.add(DefaultContextKeys.SERVER_KEY, getVaultServer()); mutContext.add(DefaultContextKeys.SERVER_KEY, getVaultServer());
} }
} }

6
common/src/main/java/me/lucko/luckperms/common/context/ContextImpl.java
View File

@ -57,6 +57,7 @@ public final class ContextImpl implements Context, Comparable<Context> {
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (this == obj) return true;
if (!(obj instanceof Context)) return false; if (!(obj instanceof Context)) return false;
Context that = (Context) obj; Context that = (Context) obj;
return this.key.equals(that.getKey()) && this.value.equals(that.getValue()); return this.key.equals(that.getKey()) && this.value.equals(that.getValue());
@ -66,4 +67,9 @@ public final class ContextImpl implements Context, Comparable<Context> {
public int hashCode() { public int hashCode() {
return this.key.hashCode() ^ this.value.hashCode(); return this.key.hashCode() ^ this.value.hashCode();
} }
@Override
public String toString() {
return this.key + '=' + this.value;
}
} }