minecraft/LuckPerms
1
0
Fork 0
mirror of https://github.com/lucko/LuckPerms.git synced 2025-08-25 15:30:45 +02:00
Code Issues Releases Wiki Activity

Conserve expiry time when promoting/demoting (#2794)

Browse Source
This commit is contained in:
Luck
2021-01-01 20:25:47 +00:00
parent 68167490d4
commit 8124a17adb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/me/lucko/luckperms/common/model/Track.java
View File

@@ -316,7 +316,7 @@ public final class Track {
} }
user.unsetNode(DataType.NORMAL, oldNode); 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)) { if (context.isEmpty() && user.getPrimaryGroup().getStoredValue().orElse(GroupManager.DEFAULT_GROUP_NAME).equalsIgnoreCase(old)) {
user.getPrimaryGroup().setStoredValue(nextGroup.getName()); user.getPrimaryGroup().setStoredValue(nextGroup.getName());
@@ -370,7 +370,7 @@ public final class Track {
} }
user.unsetNode(DataType.NORMAL, oldNode); 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)) { if (context.isEmpty() && user.getPrimaryGroup().getStoredValue().orElse(GroupManager.DEFAULT_GROUP_NAME).equalsIgnoreCase(old)) {
user.getPrimaryGroup().setStoredValue(previousGroup.getName()); user.getPrimaryGroup().setStoredValue(previousGroup.getName());