From d570d91b140a24fdec943af568284fef414568cd Mon Sep 17 00:00:00 2001 From: The_Fireplace Date: Mon, 1 Jun 2020 16:54:51 -0500 Subject: [PATCH] Temporary workaround for TheElectronWill/night-config#82 --- src/main/java/the_fireplace/clans/config/Config.java | 4 +++- src/main/java/the_fireplace/clans/logic/PlayerEventLogic.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/the_fireplace/clans/config/Config.java b/src/main/java/the_fireplace/clans/config/Config.java index 0440637b..208083e4 100644 --- a/src/main/java/the_fireplace/clans/config/Config.java +++ b/src/main/java/the_fireplace/clans/config/Config.java @@ -49,7 +49,9 @@ public static class GeneralClanSettings { @Comment("Allow players to be a member of multiple clans at once.") public boolean allowMultiClanMembership = true; @Comment("Default clan to put players in when they first join the server. Leave empty for no clan.") - public String serverDefaultClan = ""; + // Don't use empty string because night-config's HOCON writer is borked + // https://github.com/TheElectronWill/night-config/issues/82 + public String serverDefaultClan = "N/A"; @Comment("Cost of forming a clan. This requires a compatible economy to be installed.") @RangeDecimal(min=0) public double formClanCost = 0; diff --git a/src/main/java/the_fireplace/clans/logic/PlayerEventLogic.java b/src/main/java/the_fireplace/clans/logic/PlayerEventLogic.java index 409aa05a..35b31fb4 100755 --- a/src/main/java/the_fireplace/clans/logic/PlayerEventLogic.java +++ b/src/main/java/the_fireplace/clans/logic/PlayerEventLogic.java @@ -29,6 +29,8 @@ public static void onFirstLogin(UUID playerId) { Clan serverDefault = ClanCache.getClanByName(Clans.getConfig().getServerDefaultClan()); if(serverDefault != null) serverDefault.addMember(playerId); + else if(!Clans.getConfig().getServerDefaultClan().equalsIgnoreCase("N/A")) + Clans.getLogger().warn("Invalid server default clan {}, players won't be added to it.", Clans.getConfig().getServerDefaultClan()); } public static void checkUpdateDefaultClan(EntityPlayer player) {