diff --git a/common/src/main/java/me/lucko/luckperms/commands/misc/ExportCommand.java b/common/src/main/java/me/lucko/luckperms/commands/misc/ExportCommand.java index 95eaf8cc..a755a2b9 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/misc/ExportCommand.java +++ b/common/src/main/java/me/lucko/luckperms/commands/misc/ExportCommand.java @@ -127,14 +127,24 @@ public class ExportCommand extends SingleMainCommand { plugin.getDatastore().loadUser(uuid, "null"); User user = plugin.getUserManager().get(uuid); + boolean inDefault = false; for (Node node : user.getNodes()) { if (node.isGroupNode() && node.getGroupName().equalsIgnoreCase("default")) { + inDefault = true; continue; } + write(writer, nodeToString(node, user.getUuid().toString(), false)); } - write(writer, "/luckperms user " + user.getUuid().toString() + " setprimarygroup " + user.getPrimaryGroup()); + if (!user.getPrimaryGroup().equalsIgnoreCase("default")) { + write(writer, "/luckperms user " + user.getUuid().toString() + " setprimarygroup " + user.getPrimaryGroup()); + } + + if (!inDefault) { + write(writer, "/luckperms user " + user.getUuid().toString() + " removegroup default"); + } + plugin.getUserManager().cleanup(user); } log.info("Export: Exported " + userCount + " users."); diff --git a/common/src/main/java/me/lucko/luckperms/contexts/Contexts.java b/common/src/main/java/me/lucko/luckperms/contexts/Contexts.java index 70ce8600..828aff78 100644 --- a/common/src/main/java/me/lucko/luckperms/contexts/Contexts.java +++ b/common/src/main/java/me/lucko/luckperms/contexts/Contexts.java @@ -24,11 +24,13 @@ package me.lucko.luckperms.contexts; import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.ToString; import java.util.Collections; import java.util.Map; @Getter +@ToString @AllArgsConstructor public class Contexts { public static Contexts allowAll() {