From a8f9199c0fe21f83d09b3af04162a7cd1a898be6 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Fri, 1 Apr 2022 10:56:50 +0200 Subject: [PATCH 1/2] Fix ChatListener for discord messages --- src/de/steamwar/bungeecore/listeners/ChatListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/de/steamwar/bungeecore/listeners/ChatListener.java b/src/de/steamwar/bungeecore/listeners/ChatListener.java index 54b9bb4..7be73d7 100644 --- a/src/de/steamwar/bungeecore/listeners/ChatListener.java +++ b/src/de/steamwar/bungeecore/listeners/ChatListener.java @@ -174,7 +174,7 @@ public class ChatListener extends BasicListener { public static void discordChat(SteamwarUser user, String message){ String name = "§r" + user.getUserName() + "§r"; if (user.getUserGroup() != UserGroup.Member) { - name = user.getUserGroup().getColorCode() + user.getUserGroup().name() + " " + user.getUserName() + "§r"; + name = user.getUserGroup().getColorCode() + user.getUserGroup().getChatPrefix() + " " + user.getUserName() + "§r"; } String chatcolor = user.getUserGroup().getChatColorCode(); From 03befa42c0247fa01d2105e8524aebfdf495de36 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 1 Apr 2022 10:58:21 +0200 Subject: [PATCH 2/2] Fix Season Signed-off-by: Lixfel --- src/de/steamwar/bungeecore/sql/Season.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/de/steamwar/bungeecore/sql/Season.java b/src/de/steamwar/bungeecore/sql/Season.java index 86dd01c..093165f 100644 --- a/src/de/steamwar/bungeecore/sql/Season.java +++ b/src/de/steamwar/bungeecore/sql/Season.java @@ -26,13 +26,13 @@ public class Season { public static int getSeason() { Calendar calendar = Calendar.getInstance(); - int yearIndex = calendar.get(Calendar.MONTH) / 3; + int yearIndex = calendar.get(Calendar.MONTH) / 4; return (calendar.get(Calendar.YEAR) * 3 + yearIndex); } public static String getSeasonStart() { Calendar calendar = Calendar.getInstance(); - return calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) / 3 * 3 + 1) + "-1"; + return calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) / 4 * 3 + 1) + "-1"; } public static String convertSeasonToString(int season){