Merge branch 'master' into Ranked

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();
 

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){