From 6e64f80c81901de6084b7ed15186a3a5db2c47e2 Mon Sep 17 00:00:00 2001 From: Luck Date: Tue, 24 Dec 2019 18:11:58 +0000 Subject: [PATCH] Cleanup temporary handing in PermissionHolder#setNode --- .../luckperms/common/model/PermissionHolder.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java b/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java index 30e53e1f2..56c56571e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/PermissionHolder.java @@ -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; } }