From 8124a17adb378ce58b7e263af9b3d3ed4275fdd9 Mon Sep 17 00:00:00 2001 From: Luck Date: Fri, 1 Jan 2021 20:25:47 +0000 Subject: [PATCH] Conserve expiry time when promoting/demoting (#2794) --- .../src/main/java/me/lucko/luckperms/common/model/Track.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/model/Track.java b/common/src/main/java/me/lucko/luckperms/common/model/Track.java index 5683bcdc9..b06b5bd3c 100644 --- a/common/src/main/java/me/lucko/luckperms/common/model/Track.java +++ b/common/src/main/java/me/lucko/luckperms/common/model/Track.java @@ -316,7 +316,7 @@ public final class Track { } user.unsetNode(DataType.NORMAL, oldNode); - user.setNode(DataType.NORMAL, Inheritance.builder(nextGroup.getName()).withContext(context).build(), true); + user.setNode(DataType.NORMAL, oldNode.toBuilder().group(nextGroup.getName()).build(), true); if (context.isEmpty() && user.getPrimaryGroup().getStoredValue().orElse(GroupManager.DEFAULT_GROUP_NAME).equalsIgnoreCase(old)) { user.getPrimaryGroup().setStoredValue(nextGroup.getName()); @@ -370,7 +370,7 @@ public final class Track { } user.unsetNode(DataType.NORMAL, oldNode); - user.setNode(DataType.NORMAL, Inheritance.builder(previousGroup.getName()).withContext(context).build(), true); + user.setNode(DataType.NORMAL, oldNode.toBuilder().group(previousGroup.getName()).build(), true); if (context.isEmpty() && user.getPrimaryGroup().getStoredValue().orElse(GroupManager.DEFAULT_GROUP_NAME).equalsIgnoreCase(old)) { user.getPrimaryGroup().setStoredValue(previousGroup.getName());