SteamWar/BungeeCore
SteamWar/BungeeCore
Archiviert
13
2
Fork 1
Code Issues 14 Pull-Requests 4 Releases Wiki Aktivität

Merge branch 'master' into Ranked
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details

Quellcode durchsuchen
Dieser Commit ist enthalten in:
YoyoNow 2022-04-01 12:21:16 +02:00
Commit d9cd3467a4
2 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
src/de/steamwar/bungeecore/listeners/ChatListener.java
Datei anzeigen

@ -174,7 +174,7 @@ public class ChatListener extends BasicListener {
public static void discordChat(SteamwarUser user, String message){ public static void discordChat(SteamwarUser user, String message){
String name = "§r" + user.getUserName() + "§r"; String name = "§r" + user.getUserName() + "§r";
if (user.getUserGroup() != UserGroup.Member) { 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(); String chatcolor = user.getUserGroup().getChatColorCode();

4
src/de/steamwar/bungeecore/sql/Season.java
Datei anzeigen

@ -26,13 +26,13 @@ public class Season {
public static int getSeason() { public static int getSeason() {
Calendar calendar = Calendar.getInstance(); 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); return (calendar.get(Calendar.YEAR) * 3 + yearIndex);
} }
public static String getSeasonStart() { public static String getSeasonStart() {
Calendar calendar = Calendar.getInstance(); 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){ public static String convertSeasonToString(int season){