Merge branch 'master' into setupSplitting
# Conflicts: # FightSystem_Main/src/de/steamwar/fightsystem/listener/NormalJoinListener.java
Dieser Commit ist enthalten in:
Commit
b9bf52cc5f
@ -23,10 +23,10 @@ public class NormalJoinListener extends BasicListener {
|
||||
FightTeam fightTeam = Fight.getPlayerTeam(player);
|
||||
|
||||
if (fightTeam == null) {
|
||||
if(Fight.getRedTeam().canbeLeader(player)) {
|
||||
Fight.getRedTeam().setLeader(Fight.getRedTeam().addMember(player));
|
||||
} else if(Fight.getBlueTeam().canbeLeader(player)) {
|
||||
if(!player.getUniqueId().equals(Config.RedLeader) && Fight.getBlueTeam().canbeLeader(player)) {
|
||||
Fight.getBlueTeam().setLeader(Fight.getBlueTeam().addMember(player));
|
||||
}else if(Fight.getRedTeam().canbeLeader(player)) {
|
||||
Fight.getRedTeam().setLeader(Fight.getRedTeam().addMember(player));
|
||||
}
|
||||
}
|
||||
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren