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

hotfixes; split up public and private list;

Quellcode durchsuchen 
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
Dieser Commit ist enthalten in:
Yaruma3341 2019-04-13 22:01:56 +02:00
Ursprung d9b6c124eb
Commit fac373b5be
3 geänderte Dateien mit 46 neuen und 6 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

14
src/me/yaruma/fightsystem/commands/AkCommand.java
Datei anzeigen

@ -173,8 +173,18 @@ public class AkCommand implements CommandExecutor {
FightTeam fightTeam = Fight.getPlayerTeam(player);
if(fightTeam != null) {
if(fightTeam.getFightPlayer(player).isLeader()) {
Fight.getPlayerTeam(player).sendPlayerSchematicList(Integer.parseInt(args[1]), 15, player, Config.SchematicType);
return false;
if(args[0].equalsIgnoreCase("public")) {
Fight.getPlayerTeam(player).sendPlayerSchematicList(false, Integer.parseInt(args[1]), 15, player, Config.SchematicType);
return false;
} else {
int page;
try {
page = Integer.parseInt(args[1]);
} catch (NumberFormatException ex) {
return false;
}
Fight.getPlayerTeam(player).sendPlayerSchematicList(false, page, 15, player, Config.SchematicType);
}
}
}
} catch (NumberFormatException ex) {

11
src/me/yaruma/fightsystem/fight/FightTeam.java
Datei anzeigen

@ -205,9 +205,16 @@ public class FightTeam {
}
public void sendPlayerSchematicList(int currentPage, int filesPerPage, Player player, SchematicType schematicType) {
List<Schematic> preSchematicList = Schematic.getSchemsAccessibleByUser(player.getUniqueId());
public void sendPlayerSchematicList(boolean publicSchematics, int currentPage, int filesPerPage, Player player, SchematicType schematicType) {
List<Schematic> preSchematicList;
List<Schematic> schematicList = new ArrayList<>();
if(publicSchematics) {
preSchematicList = Schematic.getSchemsOfType(0, schematicType);
} else {
preSchematicList = Schematic.getSchemsAccessibleByUser(player.getUniqueId());
}
for(Schematic s : preSchematicList) {
if(s.getSchemType() == schematicType)
schematicList.add(s);

27
src/me/yaruma/fightsystem/listener/PlayerJoinListener.java
Datei anzeigen

@ -10,6 +10,11 @@ import me.yaruma.fightsystem.utils.countdown.Countdown;
import me.yaruma.fightsystem.utils.countdown.CountdownType;
import me.yaruma.fightsystem.utils.countdown.FinishSetupOver;
import me.yaruma.fightsystem.utils.inventory.SetupItems;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.entity.Player;
@ -32,14 +37,32 @@ public class PlayerJoinListener implements Listener {
player.getInventory().clear();
if (Fight.getPlayerTeam(player) == null) {
//TEXT COMPONENTS
TextComponent publicList = new TextComponent("public");
publicList.setColor(ChatColor.GOLD);
publicList.setBold(true);
publicList.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("§ePublic Liste...").create()));
publicList.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/ak schemlist public"));
TextComponent privateList = new TextComponent("private");
publicList.setColor(ChatColor.GOLD);
publicList.setBold(true);
publicList.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("§ePrivate Liste...").create()));
publicList.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/ak schemlist 0"));
publicList.addExtra(privateList);
player.spigot().sendMessage(publicList);
//TEXT COMPONENTS
if(!Fight.getRedTeam().hasTeamLeader()) {
Fight.getRedTeam().setLeader(new FightPlayer(player, false));
Fight.getRedTeam().sendPlayerSchematicList(0, 15, player, Config.SchematicType);
player.setGameMode(GameMode.ADVENTURE);
player.spigot().sendMessage(publicList);
} else if(!Fight.getBlueTeam().hasTeamLeader()) {
Fight.getBlueTeam().setLeader(new FightPlayer(player, false));
Fight.getBlueTeam().sendPlayerSchematicList(0, 15, player, Config.SchematicType);
player.setGameMode(GameMode.ADVENTURE);
player.spigot().sendMessage(publicList);
} else {
player.setGameMode(GameMode.SPECTATOR);
player.teleport(Config.SpecSpawn);