JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move spawn related methods to challenge classes

Browse Source
This commit is contained in:
Thanos Paravantis 2016-07-01 17:18:03 +03:00
parent 6fdbda0ed0
commit e2663d6448
3 changed files with 82 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java
View File

@ -76,9 +76,8 @@ import nautilus.game.arcade.game.GameTeam;
import nautilus.game.arcade.game.TeamGame; import nautilus.game.arcade.game.TeamGame;
import nautilus.game.arcade.game.games.mineware.challenge.Challenge; import nautilus.game.arcade.game.games.mineware.challenge.Challenge;
import nautilus.game.arcade.game.games.mineware.challenge.ChallengeData; import nautilus.game.arcade.game.games.mineware.challenge.ChallengeData;
import nautilus.game.arcade.game.games.mineware.challenge.ChallengeSettings;
import nautilus.game.arcade.game.games.mineware.challenge.ChallengeList; import nautilus.game.arcade.game.games.mineware.challenge.ChallengeList;
import nautilus.game.arcade.game.games.mineware.challenge.TeamChallenge; import nautilus.game.arcade.game.games.mineware.challenge.ChallengeSettings;
import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeAnvilDance; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeAnvilDance;
import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeArrowRampage; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeArrowRampage;
import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeBlockLobbers; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeBlockLobbers;
@ -398,6 +397,10 @@ public class BawkBawkBattles extends TeamGame implements IThrown
} }
} }
/*
* Spawns
*/
private ArrayList<Location> setupChallengeSpawnLocations() private ArrayList<Location> setupChallengeSpawnLocations()
{ {
ArrayList<Location> selected = _challenge.createSpawns(); ArrayList<Location> selected = _challenge.createSpawns();
@ -434,10 +437,6 @@ public class BawkBawkBattles extends TeamGame implements IThrown
} }
} }
/*
* Spawns
*/
private void teleportSpectatorsToSpawn() private void teleportSpectatorsToSpawn()
{ {
for (Player player : GetPlayers(false)) for (Player player : GetPlayers(false))
@ -451,15 +450,7 @@ public class BawkBawkBattles extends TeamGame implements IThrown
private void teleportPlayersToSpawns(boolean firstRun) private void teleportPlayersToSpawns(boolean firstRun)
{ {
if (_challenge instanceof TeamChallenge) _challenge.spawn(firstRun);
{
teamTeleport(firstRun);
}
else
{
playerTeleport(firstRun);
}
removeSolidBlockForPlayers(); removeSolidBlockForPlayers();
} }
@ -489,46 +480,6 @@ public class BawkBawkBattles extends TeamGame implements IThrown
} }
} }
private void teamTeleport(boolean firstRun)
{
TeamChallenge teamChallenge = (TeamChallenge) _challenge;
if (teamChallenge.shouldTeamSpawn())
{
teamChallenge.spawn(firstRun);
}
else
{
playerTeleport(firstRun);
}
}
private void playerTeleport(boolean firstRun)
{
if (firstRun)
{
ArrayList<Player> players = GetPlayers(false);
for (int i = 0; i < players.size(); i++)
{
Player player = players.get(i);
new BukkitRunnable()
{
@Override
public void run()
{
_playerTeam.SpawnTeleport(player);
}
}.runTaskLater(Manager.getPlugin(), i);
}
}
else
{
_playerTeam.SpawnTeleport(false);
}
}
/* /*
* Start * Start
*/ */
@ -948,7 +899,7 @@ public class BawkBawkBattles extends TeamGame implements IThrown
{ {
for (Player player : UtilServer.getPlayers()) for (Player player : UtilServer.getPlayers())
{ {
UtilTextTop.displayTextBar(player, _challenge.getTimeLeftPercent(), C.cYellow + C.Bold + _challenge.getName()); UtilTextTop.displayTextBar(player, _challenge.getTimeLeftPercent(), C.cYellowB + _challenge.getName());
player.setLevel(_challenge.getRemainingPlaces()); player.setLevel(_challenge.getRemainingPlaces());
player.setExp(_challenge.getTimeLeftPercent()); player.setExp(_challenge.getTimeLeftPercent());
} }

26
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/Challenge.java
View File

@ -121,6 +121,32 @@ public abstract class Challenge implements Listener
return true; return true;
} }
public void spawn(boolean firstRun)
{
if (firstRun)
{
ArrayList<Player> players = Host.GetPlayers(false);
for (int i = 0; i < players.size(); i++)
{
Player player = players.get(i);
new BukkitRunnable()
{
@Override
public void run()
{
Host.getPlayerTeam().SpawnTeleport(player);
}
}.runTaskLater(Host.Manager.getPlugin(), i);
}
}
else
{
Host.getPlayerTeam().SpawnTeleport(false);
}
}
public void start() public void start()
{ {
Settings.setStartTime(System.currentTimeMillis()); Settings.setStartTime(System.currentTimeMillis());

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/TeamChallenge.java
View File

@ -54,7 +54,10 @@ public abstract class TeamChallenge extends Challenge
* Called automatically only when _teamSpawn is true. * Called automatically only when _teamSpawn is true.
*/ */
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@Override
public void spawn(boolean firstRun) public void spawn(boolean firstRun)
{
if (_teamSpawn)
{ {
autoSelectTeams(); autoSelectTeams();
@ -113,6 +116,11 @@ public abstract class TeamChallenge extends Challenge
} }
} }
} }
else
{
super.spawn(firstRun);
}
}
private void teleportWithDelay(Player player, final Location spawn, int teleported) private void teleportWithDelay(Player player, final Location spawn, int teleported)
{ {