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

Not stable version

Quellcode durchsuchen 
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
Dieser Commit ist enthalten in:
Yaruma3341 2019-02-23 20:35:30 +01:00
Ursprung c06a6803cc
Commit c81a454f43
2 geänderte Dateien mit 8 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

3
src/me/yaruma/fightsystem/listener/EntityDamageByEntityListener.java
Datei anzeigen

@ -22,6 +22,9 @@ public class EntityDamageByEntityListener implements Listener {
if(event.getEntity() instanceof Player) { if(event.getEntity() instanceof Player) {
event.setCancelled(true); event.setCancelled(true);
} }
if(event.getDamager() instanceof TNTPrimed) {
event.setCancelled(true);
}
} else { } else {
if(event.getEntity() instanceof Player) { if(event.getEntity() instanceof Player) {
Player player = ((Player) event.getEntity()).getPlayer(); Player player = ((Player) event.getEntity()).getPlayer();

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

@ -33,14 +33,11 @@ public class PlayerJoinListener implements Listener {
if(!Fight.getRedTeam().hasTeamLeader()) { if(!Fight.getRedTeam().hasTeamLeader()) {
Fight.getRedTeam().setLeader(new FightPlayer(player, false)); Fight.getRedTeam().setLeader(new FightPlayer(player, false));
player.setGameMode(GameMode.ADVENTURE); player.setGameMode(GameMode.ADVENTURE);
Bukkit.broadcastMessage("ADVENTURE 36");
} else if(!Fight.getBlueTeam().hasTeamLeader()) { } else if(!Fight.getBlueTeam().hasTeamLeader()) {
Fight.getBlueTeam().setLeader(new FightPlayer(player, false)); Fight.getBlueTeam().setLeader(new FightPlayer(player, false));
player.setGameMode(GameMode.ADVENTURE); player.setGameMode(GameMode.ADVENTURE);
Bukkit.broadcastMessage("ADVENTURE 39");
} else { } else {
player.setGameMode(GameMode.SPECTATOR); player.setGameMode(GameMode.SPECTATOR);
Bukkit.broadcastMessage("SPECTATOR 42");
player.teleport(instance.getSpecSpawnLoc()); player.teleport(instance.getSpecSpawnLoc());
} }
} }
@ -58,8 +55,11 @@ public class PlayerJoinListener implements Listener {
player.setGameMode(GameMode.ADVENTURE); player.setGameMode(GameMode.ADVENTURE);
if(fightPlayer.isLeader()) SetupItems.giveSetupItems(player); if(fightPlayer.isLeader()) SetupItems.giveSetupItems(player);
if(fightPlayer.isOut()) {
fightPlayer.setOut(false); fightPlayer.setOut(false);
Bukkit.broadcastMessage(FightSystem.PREFIX + "§aDer Spieler §6" + fightPlayer.getPlayer().getName() + " §aist dem Kampf wieder beigetreten!"); Bukkit.broadcastMessage(FightSystem.PREFIX + "§aDer Spieler §6" + fightPlayer.getPlayer().getName() + " §aist dem Kampf wieder beigetreten!");
} else
Bukkit.broadcastMessage(FightSystem.PREFIX + "§aDer Spieler §6" + fightPlayer.getPlayer().getName() + " §aist dem Kampf beigetreten!");
} else { } else {
player.setGameMode(GameMode.SPECTATOR); player.setGameMode(GameMode.SPECTATOR);
if(fightTeam == Fight.redTeam) if(fightTeam == Fight.redTeam)