Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-27 21:29:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix NPE in QueryOptionsImpl (#2051, #2052)

Browse Source
This commit is contained in:
Luck 2020-03-11 11:38:38 +00:00
parent bbec0932fd
commit 2518a7c8e5
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/me/lucko/luckperms/common/query/QueryOptionsImpl.java
View File

@ -36,6 +36,7 @@ import net.luckperms.api.query.QueryMode;
import net.luckperms.api.query.QueryOptions; import net.luckperms.api.query.QueryOptions;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
@ -51,11 +52,11 @@ public class QueryOptionsImpl implements QueryOptions {
private Set<Flag> flagsSet = null; private Set<Flag> flagsSet = null;
QueryOptionsImpl(QueryMode mode, ImmutableContextSet context, byte flags, Map<OptionKey<?>, Object> options) { QueryOptionsImpl(QueryMode mode, @Nullable ImmutableContextSet context, byte flags, @Nullable Map<OptionKey<?>, Object> options) {
this.mode = mode; this.mode = mode;
this.context = context; this.context = context;
this.flags = flags; this.flags = flags;
this.options = ImmutableMap.copyOf(options); this.options = options == null ? null : ImmutableMap.copyOf(options);
this.hashCode = calculateHashCode(); this.hashCode = calculateHashCode();
} }
@ -104,6 +105,9 @@ public class QueryOptionsImpl implements QueryOptions {
@Override @Override
public @NonNull Map<OptionKey<?>, Object> options() { public @NonNull Map<OptionKey<?>, Object> options() {
if (this.options == null) {
return ImmutableMap.of();
}
return this.options; return this.options;
} }