Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2025-01-29 11:41:45 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup temporary handing in PermissionHolder#setNode

Browse Source
This commit is contained in:
Luck 2019-12-24 18:11:58 +00:00
parent 8906e4c4fc
commit 6e64f80c81
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java
View File

@ -428,11 +428,12 @@ public abstract class PermissionHolder {
}
public DataMutateResult.WithMergedNode setNode(DataType dataType, Node node, TemporaryNodeMergeStrategy mergeStrategy) {
if (node.hasExpiry() && mergeStrategy != TemporaryNodeMergeStrategy.NONE) {
if (node.getExpiry() != null && mergeStrategy != TemporaryNodeMergeStrategy.NONE) {
Node otherMatch = getData(dataType).immutable().values().stream()
.filter(NodeEqualityPredicate.IGNORE_EXPIRY_TIME_AND_VALUE.equalTo(node))
.findFirst().orElse(null);
if (otherMatch != null) {
if (otherMatch != null && otherMatch.getExpiry() != null) {
NodeMap data = getData(dataType);
Node newNode = null;
@ -445,10 +446,10 @@ public abstract class PermissionHolder {
}
case REPLACE_EXISTING_IF_DURATION_LONGER: {
// Only replace if the new expiry time is greater than the old one.
if (node.getExpiry().getEpochSecond() <= otherMatch.getExpiry().getEpochSecond()) {
break;
if (node.getExpiry().compareTo(otherMatch.getExpiry()) > 0) {
newNode = node;
}
newNode = node;
break;
}
}