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

bug fixes

Quellcode durchsuchen 
Signed-off-by: Yaruma3341 <yaruma3341@gmail.com>
Dieser Commit ist enthalten in:
Yaruma3341 2019-03-25 17:05:33 +01:00
Ursprung cd5399d1a8
Commit 872f57cff4
4 geänderte Dateien mit 9 neuen und 18 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

1
src/me/yaruma/fightsystem/FightSystem.java
Datei anzeigen

@ -336,7 +336,6 @@ public class FightSystem extends JavaPlugin {
}
}
Countdown.cancelAllTimers();
Countdown countdown = new Countdown(20*60, new FinishSpectateOver());
countdown.startTimer(FightSystem.getPlugin());
}

2
src/me/yaruma/fightsystem/listener/PlayerDeathListener.java
Datei anzeigen

@ -19,7 +19,7 @@ public class PlayerDeathListener implements Listener {
if(Fight.getPlayerTeam(player) == null) return;
FightTeam fightTeam = Fight.getPlayerTeam(player);
fightTeam.getFightPlayer(player).setOut(true);
Bukkit.broadcastMessage(FightSystem.PREFIX + "§cDer Spieler §6" + player.getName() + " §cist gestorben!");
event.setDeathMessage(FightSystem.PREFIX + "§cDer Spieler §6" + player.getName() + " §cist gestorben!");
}

11
src/me/yaruma/fightsystem/listener/PlayerInteractListener.java
Datei anzeigen

@ -6,8 +6,6 @@ import me.yaruma.fightsystem.fight.FightPlayer;
import me.yaruma.fightsystem.fight.FightState;
import me.yaruma.fightsystem.fight.FightTeam;
import me.yaruma.fightsystem.manager.FileManager;
import me.yaruma.fightsystem.utils.countdown.Countdown;
import me.yaruma.fightsystem.utils.countdown.FinishNoPlayersOnline;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
@ -43,13 +41,8 @@ public class PlayerInteractListener implements Listener {
fightTeam.setReady(false);
break;
case "§4Abbrechen":
Bukkit.broadcastMessage(FightSystem.PREFIX + "§6Das Team von §a" + fightTeam.getLeader().getPlayer().getName() + " §6hat den Kampf abgebrochen! \n Server stoppt in 30 Sekunden...");
player.getInventory().clear();
if(Fight.getOpposite(fightTeam).getLeader().getPlayer() != null) Fight.getOpposite(fightTeam).getLeader().getPlayer().getInventory().clear();
Countdown.cancelAllTimers();
Countdown countdown = new Countdown(30, new FinishNoPlayersOnline());
countdown.startTimer(instance);
Bukkit.broadcastMessage(FightSystem.PREFIX + "§6Das Team von §a" + fightTeam.getLeader().getPlayer().getName() + " §6hat den Kampf abgebrochen! \n Server stoppt...");
Bukkit.shutdown();
break;
default:
event.setCancelled(true);

13
src/me/yaruma/fightsystem/listener/PlayerRespawnListener.java
Datei anzeigen

@ -15,13 +15,12 @@ public class PlayerRespawnListener implements Listener {
public void handlePlayerRespawn(PlayerRespawnEvent event) {
Player player = event.getPlayer();
if(Fight.getPlayerTeam(player) != null) {
player.teleport(instance.getSpecSpawnLoc());
} else {
if(Fight.getPlayerTeam(player) == Fight.redTeam)
instance.getTeam1SpawnLoc();
else
instance.getTeam2SpawnLoc();
}
if(Fight.getPlayerTeam(player) == Fight.redTeam) {
event.setRespawnLocation(instance.getTeam1SpawnLoc());
} else
event.setRespawnLocation(instance.getTeam2SpawnLoc());
} else
event.setRespawnLocation(instance.getSpecSpawnLoc());
}