SteamWar/FightSystem
SteamWar/FightSystem
Archiviert
13
1
Fork 0
Code Issues 6 Pull-Requests Releases Wiki Aktivität

Merge pull request 'Use TeamColor' (#222) from team-color into master

Quellcode durchsuchen 
Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
Lixfel 2021-01-02 09:37:44 +01:00
Commit 17f32f9f14
2 geänderte Dateien mit 8 neuen und 6 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

10
FightSystem_API/src/de/steamwar/fightsystem/Config.java
Datei anzeigen

@ -95,8 +95,8 @@ public class Config {
//team parameter //team parameter
public static final String TeamRedName; public static final String TeamRedName;
public static final String TeamBlueName; public static final String TeamBlueName;
public static final String TeamRedPrefix; public static final String TeamRedColor;
public static final String TeamBluePrefix; public static final String TeamBlueColor;
public static final String GameName; public static final String GameName;
public static final String TeamChatDetection; public static final String TeamChatDetection;
public static final UUID BlueLeader; public static final UUID BlueLeader;
@ -197,8 +197,6 @@ public class Config {
ReplaceBedrock = config.getBoolean("Schematic.ReplaceBedrock"); ReplaceBedrock = config.getBoolean("Schematic.ReplaceBedrock");
ReplaceWithBlockupdates = config.getBoolean("Schematic.ReplaceWithBlockupdates"); ReplaceWithBlockupdates = config.getBoolean("Schematic.ReplaceWithBlockupdates");
TeamRedPrefix = config.getString("Output.TeamRedPrefix");
TeamBluePrefix = config.getString("Output.TeamBluePrefix");
GameName = config.getString("Output.GameName"); GameName = config.getString("Output.GameName");
TeamChatDetection = config.getString("Output.TeamChatDetection"); TeamChatDetection = config.getString("Output.TeamChatDetection");
@ -361,6 +359,8 @@ public class Config {
assert team2 != null; assert team2 != null;
TeamBlueName = team1.getTeamKuerzel(); TeamBlueName = team1.getTeamKuerzel();
TeamRedName = team2.getTeamKuerzel(); TeamRedName = team2.getTeamKuerzel();
TeamBlueColor = "§" + team1.getTeamColor();
TeamRedColor = "§" + team2.getTeamColor();
EventTeamBlueID = team1.getTeamId(); EventTeamBlueID = team1.getTeamId();
EventTeamRedID = team2.getTeamId(); EventTeamRedID = team2.getTeamId();
BothTeamsPublic = EventTeamRedID == 0 && EventTeamBlueID == 0; BothTeamsPublic = EventTeamRedID == 0 && EventTeamBlueID == 0;
@ -378,6 +378,8 @@ public class Config {
SpectateSystem = event.spectateSystem(); SpectateSystem = event.spectateSystem();
}else{ }else{
//No event //No event
TeamRedColor = config.getString("Output.TeamRedPrefix");
TeamBlueColor = config.getString("Output.TeamBluePrefix");
TeamRedName = config.getString("Output.TeamRedName"); TeamRedName = config.getString("Output.TeamRedName");
TeamBlueName = config.getString("Output.TeamBlueName"); TeamBlueName = config.getString("Output.TeamBlueName");
OnlyPublicSchematics = config.getBoolean("Schematic.OnlyPublicSchematics"); OnlyPublicSchematics = config.getBoolean("Schematic.OnlyPublicSchematics");

4
FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java
Datei anzeigen

@ -41,8 +41,8 @@ import java.util.logging.Level;
public class Fight { public class Fight {
private Fight(){} private Fight(){}
public static final FightTeam redTeam = new FightTeam(Config.TeamRedName, Config.TeamRedPrefix, Config.TeamRedSpawn, Config.TeamRedCornerX, Config.TeamRedCornerY, Config.TeamRedCornerZ, Config.TeamRedRotate, false, Config.RedLeader); public static final FightTeam redTeam = new FightTeam(Config.TeamRedName, Config.TeamRedColor, Config.TeamRedSpawn, Config.TeamRedCornerX, Config.TeamRedCornerY, Config.TeamRedCornerZ, Config.TeamRedRotate, false, Config.RedLeader);
public static final FightTeam blueTeam = new FightTeam(Config.TeamBlueName, Config.TeamBluePrefix, Config.TeamBlueSpawn, Config.TeamBlueCornerX, Config.TeamBlueCornerY, Config.TeamBlueCornerZ, Config.TeamBlueRotate, true, Config.BlueLeader); public static final FightTeam blueTeam = new FightTeam(Config.TeamBlueName, Config.TeamBlueColor, Config.TeamBlueSpawn, Config.TeamBlueCornerX, Config.TeamBlueCornerY, Config.TeamBlueCornerZ, Config.TeamBlueRotate, true, Config.BlueLeader);
private static int schemRank; private static int schemRank;
public static void init(){ public static void init(){