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

Fix Tag Master, show bouncing block full score

Browse Source
This commit is contained in:
Thanos Paravantis 2016-07-13 17:13:02 +03:00
parent 6cef42d7a4
commit 2e5d7c023f
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,6 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scoreboard.Scoreboard;
import com.google.common.collect.Lists;
@ -72,7 +71,6 @@ import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType;
import nautilus.game.arcade.events.GamePrepareCountdownCommence;
import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.game.Game.GameState;
import nautilus.game.arcade.game.GameTeam;
import nautilus.game.arcade.game.TeamGame;
import nautilus.game.arcade.game.games.mineware.challenge.Challenge;
@ -123,7 +121,6 @@ import nautilus.game.arcade.game.games.mineware.tracker.SurfUpTracker;
import nautilus.game.arcade.game.games.mineware.tracker.TagMasterTracker;
import nautilus.game.arcade.game.games.mineware.tracker.VeteranTracker;
import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.world.WorldData;
/**
* <p>
@ -465,6 +462,8 @@ public class BawkBawkBattles extends TeamGame implements IThrown
{
for (Player player : GetPlayers(false))
{
System.out.println("Resetting: " + player.getName());
if (_lives.get(player) > 0)
{
Manager.Clear(player);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBouncingBlock.java
View File

@ -177,7 +177,7 @@ public class ChallengeBouncingBlock extends Challenge implements LogicTracker
if (event.getType() != UpdateType.TICK)
return;
for (Player player : getPlayersIn(true))
for (Player player : getPlayersIn(false))
{
UtilTextBottom.display(C.Bold + "Score: " + C.Reset + C.cYellow + C.Bold + _score.get(player), player);
}

9
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeReverseTag.java
View File

@ -267,14 +267,7 @@ public class ChallengeReverseTag extends TeamChallenge implements LogicTracker
private void trackTag(Player player)
{
if (_tagTracker.containsKey(player))
{
if (_tagTracker.get(player))
{
_tagTracker.put(player, true);
}
}
else
if (!_tagTracker.containsKey(player))
{
_tagTracker.put(player, true);
}

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/TagMasterTracker.java
View File

@ -28,7 +28,7 @@ public class TagMasterTracker extends ChallengeStatTracker
{
ChallengeReverseTag reverseTag = (ChallengeReverseTag) challenge;
for (Player player : reverseTag.getFirstTeam().getPlayers())
for (Player player : getGame().GetPlayers(false))
{
if (reverseTag.hasData(player))
{