From 0bf96281956b88d6f21d026406227f2111a7f7d8 Mon Sep 17 00:00:00 2001
From: Cheese <christopherjozsa@gmail.com>
Date: Tue, 7 Jul 2015 19:01:53 +1000
Subject: [PATCH 1/5] removed unneeded test file

---
 Pocket/WorldConfig.dat | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 Pocket/WorldConfig.dat

diff --git a/Pocket/WorldConfig.dat b/Pocket/WorldConfig.dat
deleted file mode 100644
index a0fa54ce4..000000000
--- a/Pocket/WorldConfig.dat
+++ /dev/null
@@ -1,28 +0,0 @@
-MAP_NAME:Cookie Town
-MAP_AUTHOR:Mineplex Build Team
-
-MIN_X:-123
-MAX_X:58
-MIN_Z:-74
-MAX_Z:91
-
-MIN_Y:0
-MAX_Y:26
-
-TEAM_NAME:Blue
-TEAM_SPAWNS:-2,4,-1:-2,4,0:-2,4,1:-2,4,2:-2,4,3:-2,4,4:-2,4,5:-2,4,6:-1,4,-1:-1,4,0:-1,4,1:-1,4,2:-1,4,3:-1,4,4:-1,4,5:-1,4,6:0,4,-1:0,4,0:0,4,1:0,4,2:0,4,3:0,4,4:0,4,5:0,4,6:1,4,-1:1,4,0:1,4,1:1,4,2:1,4,3:1,4,4:1,4,5:1,4,6:2,4,-1:2,4,0:2,4,1:2,4,2:2,4,3:2,4,4:2,4,5:2,4,6:3,4,-1:3,4,0:3,4,1:3,4,2:3,4,3:3,4,4:3,4,5:3,4,6:4,4,-1:4,4,0:4,4,1:4,4,2:4,4,3:4,4,4:4,4,5:4,4,6:5,4,-1:5,4,0:5,4,1:5,4,2:5,4,3:5,4,4:5,4,5:5,4,6:
-
-TEAM_NAME:Red
-TEAM_SPAWNS:-94,2,-10:-94,2,-9:-94,2,-8:-94,2,-7:-94,2,-6:-94,2,-5:-94,2,-4:-94,2,-3:-94,2,-2:-93,2,-10:-93,2,-9:-93,2,-8:-93,2,-7:-93,2,-6:-93,2,-5:-93,2,-4:-93,2,-3:-93,2,-2:-92,2,-10:-92,2,-9:-92,2,-8:-92,2,-7:-92,2,-6:-92,2,-5:-92,2,-4:-92,2,-3:-92,2,-2:
-
-DATA_NAME:YELLOW
-DATA_LOCS:-39,4,7:-39,4,8:-38,4,7:-38,4,8:-33,4,3:-33,4,4:-32,4,2:-32,4,3:-32,4,4:-14,4,-25:-13,4,-26:-13,4,-25:-12,4,-26:-12,4,-25:-11,4,-26:-11,4,-25:-10,4,-25:-8,4,55:-8,4,56:-8,4,57:-7,4,55:-7,4,56:-7,4,57:-7,4,58:-6,4,55:-6,4,56:-6,4,57:-6,4,58:-5,4,69:-5,4,70:-4,4,69:-4,4,70:-2,4,14:-2,4,15:-2,4,16:-1,4,14:-1,4,15:-1,4,16:0,4,14:0,4,15:0,4,16:6,4,-31:7,4,-31:8,4,-31:38,4,35:38,4,36:38,4,37:39,4,35:39,4,36:39,4,37:
-
-DATA_NAME:BLACK
-DATA_LOCS:-94,4,-1:-94,4,0:-94,4,1:-93,4,-1:-93,4,0:-93,4,1:-92,4,-1:-92,4,0:-92,4,1:
-
-DATA_NAME:PINK
-DATA_LOCS:-37,4,7:-37,4,8:-36,4,-16:-36,4,-15:-36,4,-14:-36,4,7:-36,4,8:-35,4,-16:-35,4,-15:-35,4,-14:-34,4,-16:-34,4,-15:-34,4,-14:-3,4,81:-3,4,82:-2,4,80:-2,4,81:-2,4,82:-2,4,83:-1,4,80:-1,4,81:-1,4,82:-1,4,83:0,4,43:1,4,43:2,4,43:3,4,43:3,4,47:3,4,48:4,4,43:4,4,47:4,4,48:6,4,-32:7,4,-32:7,4,-7:7,4,-6:8,4,-32:8,4,-7:8,4,-6:9,4,-8:9,4,-7:11,4,69:11,4,70:11,4,71:12,4,69:12,4,71:13,4,70:29,4,42:29,4,43:29,4,44:30,4,42:30,4,43:30,4,44:31,4,42:31,4,43:31,4,44:
-
-DATA_NAME:RED
-DATA_LOCS:-96,5,4:-93,5,5:-90,5,4:
\ No newline at end of file

From 9eff5b7245ba9b20a8145eab71910168ad082bc9 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Wed, 8 Jul 2015 07:51:33 +1200
Subject: [PATCH 2/5] Perks: Forgot to include this in last commit, no harm
 done.

---
 .../src/nautilus/game/arcade/game/Game.java                 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
index 4ae370d96..abe4d740c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
@@ -498,7 +498,11 @@ public abstract class Game implements Listener
 			UtilServer.getServer().getPluginManager().registerEvents(kit, Manager.getPlugin());
 
 			for (Perk perk : kit.GetPerks())
-				UtilServer.getServer().getPluginManager().registerEvents(perk, Manager.getPlugin());
+			{
+				UtilServer.getServer().getPluginManager()
+						.registerEvents(perk, Manager.getPlugin());
+				perk.registeredEvents();
+			}
 		}
 	}
 

From ffbee4a9aa96737ccf773f2546f093b5c9bda038 Mon Sep 17 00:00:00 2001
From: Ben Sihota <contact@horusdev.com>
Date: Tue, 7 Jul 2015 18:20:27 -0700
Subject: [PATCH 3/5] Add more details to /game Fix NPE with /game set

---
 Plugins/.idea/artifacts/Mineplex_Hub_jar.xml  |  1 +
 Plugins/.idea/codeStyleSettings.xml           |  5 ++--
 .../game/arcade/command/GameCommand.java      |  8 +++++-
 .../game/arcade/command/SetCommand.java       | 25 +++++++++----------
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml b/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml
index a90117bcf..150c21bc3 100644
--- a/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml
+++ b/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml
@@ -19,6 +19,7 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/gson-2.2.1.jar" path-in-jar="/" />
       <element id="module-output" name="Mineplex.Database" />
       <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jooq-3.5.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-dbcp2-2.0.1.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>
\ No newline at end of file
diff --git a/Plugins/.idea/codeStyleSettings.xml b/Plugins/.idea/codeStyleSettings.xml
index a206a6aca..8e890f86b 100644
--- a/Plugins/.idea/codeStyleSettings.xml
+++ b/Plugins/.idea/codeStyleSettings.xml
@@ -37,7 +37,6 @@
         </codeStyleSettings>
       </value>
     </option>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Mineplex" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java
index 50fbfe062..ec1eb238f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java
@@ -1,5 +1,7 @@
 package nautilus.game.arcade.command;
 
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
 import org.bukkit.entity.Player;
 
 import nautilus.game.arcade.ArcadeManager;
@@ -20,6 +22,10 @@ public class GameCommand extends MultiCommandBase<ArcadeManager>
 	@Override
 	protected void Help(Player caller, String[] args)
 	{
-
+		UtilPlayer.message(caller, F.main(Plugin.getName(), "Commands List:"));
+		UtilPlayer.message(caller, F.help("/game start", "Start the current game", Rank.ADMIN));
+		UtilPlayer.message(caller, F.help("/game stop", "Stop the current game", Rank.ADMIN));
+		UtilPlayer.message(caller, F.help("/game set <GameType> (Map)", "Set the current game or next game", Rank.ADMIN));
+		UtilPlayer.message(caller, F.main("Tip", "Use TAB for games/maps!"));
 	}
 }
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java
index e49c88b6d..7db88b496 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java
@@ -1,19 +1,18 @@
 package nautilus.game.arcade.command;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import nautilus.game.arcade.ArcadeManager;
-import nautilus.game.arcade.GameType;
-import nautilus.game.arcade.game.Game.GameState;
-import mineplex.core.command.CommandBase;
-import mineplex.core.common.Rank;
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.UtilPlayer;
+import java.util.ArrayList;
+import java.util.List;
 
 public class SetCommand extends CommandBase<ArcadeManager>
 { 
@@ -28,9 +27,9 @@ public class SetCommand extends CommandBase<ArcadeManager>
 		if (Plugin.GetGame() == null)
 			return;
 		 
-		if (args.length == 0)
+		if (args == null || args.length == 0)
 		{
-			caller.sendMessage("/game set <GameType> (Map)");
+			caller.sendMessage(F.help("/game set <GameType> (Map)", "Set the current game or next game", Rank.ADMIN));
 			return; 
 		}
 		
@@ -43,7 +42,7 @@ public class SetCommand extends CommandBase<ArcadeManager>
 		}
 		
 		//Parse Game
-		ArrayList<GameType> matches = new ArrayList<GameType>();
+		ArrayList<GameType> matches = new ArrayList<>();
 		for (GameType type : GameType.values())
 		{
 			if (type.toString().toLowerCase().equals(game))

From 1f250bf951da1a2c3154e4a32fff0fae29a7a247 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Wed, 8 Jul 2015 18:43:37 +1200
Subject: [PATCH 4/5] MineWare: Add current progress

---
 .../arcade/game/games/mineware/MineWare.java  |  73 +++++---
 .../challenges/ChallengeChickenFishing.java   | 125 +++++++++++++
 .../challenges/ChallengeDragonEgg.java        |  32 ++--
 .../mineware/challenges/ChallengeRunner.java  | 175 ++++++++++++++++++
 .../mineware/challenges/ChallengeSpleef.java  | 103 +++++++++++
 .../challenges/ChallengeVolleyPig.java        |   2 +-
 6 files changed, 471 insertions(+), 39 deletions(-)
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeChickenFishing.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeRunner.java
 create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeSpleef.java

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
index 10682c0ab..1634b5c6c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
@@ -59,15 +59,16 @@ public class MineWare extends SoloGame
 		super(manager, GameType.MineWare,
 
 		new Kit[]
-			{
-				new KitNormal(manager),
-			},
+		{
+			new KitNormal(manager),
+		},
 
 		new String[]
-			{
-					"Follow the orders given in chat!", "First half to follow it win the round.", "Other players lose one life.",
-					"Last player with lives wins!"
-			});
+		{
+				"Follow the orders given in chat!",
+				"First half to follow it win the round.",
+				"Other players lose one life.", "Last player with lives wins!"
+		});
 
 		DamageTeamSelf = true;
 		DamagePvP = false;
@@ -147,6 +148,8 @@ public class MineWare extends SoloGame
 		// _orders.add(ChallengeSkyFall.class);
 		_orders.add(ChallengeSmashOff.class);
 		_orders.add(ChallengeTntLauncher.class);
+		//_orders.add(ChallengeSpleef.class); TODO
+		//_orders.add(ChallengeRunner.class); TODO
 		// _orders.add(ChallengeDiamondFall.class);
 	}
 
@@ -161,17 +164,21 @@ public class MineWare extends SoloGame
 					_ordersCopy.addAll(_orders);
 				}
 
-				Challenge challenge = _ordersCopy.remove(UtilMath.r(_ordersCopy.size())).getConstructor(MineWare.class)
-						.newInstance(this);
+				Challenge challenge = _ordersCopy
+						.remove(UtilMath.r(_ordersCopy.size()))
+						.getConstructor(MineWare.class).newInstance(this);
 
 				if (getChallengers().size() >= challenge.getMinPlayers())
 				{
-					System.out.print("Using challenge " + challenge.getClass().getSimpleName());
+					System.out.print("Using challenge "
+							+ challenge.getClass().getSimpleName());
 					return challenge;
 				}
 				else
 				{
-					System.out.print("Cannot use challenge " + challenge.getClass().getSimpleName() + ", not enough players");
+					System.out.print("Cannot use challenge "
+							+ challenge.getClass().getSimpleName()
+							+ ", not enough players");
 
 				}
 			}
@@ -201,7 +208,8 @@ public class MineWare extends SoloGame
 		_order.generateRoom();
 
 		GetTeamList().get(0).SetSpawns(_order.getSpawns());
-		SpectatorSpawn = UtilWorld.averageLocation(_order.getSpawns()).add(0, 7, 0);
+		SpectatorSpawn = UtilWorld.averageLocation(_order.getSpawns()).add(0,
+				7, 0);
 	}
 
 	@EventHandler
@@ -264,7 +272,10 @@ public class MineWare extends SoloGame
 		for (Player player : UtilServer.getPlayers())
 		{
 			player.playSound(player.getLocation(), Sound.NOTE_PLING, 1f, 1f);
-			String message = C.cYellow + C.Bold + (IsAlive(player) ? challenge.getMessage(player) : challenge.GetOrder());
+			String message = C.cYellow
+					+ C.Bold
+					+ (IsAlive(player) ? challenge.getMessage(player)
+							: challenge.GetOrder());
 
 			UtilPlayer.message(player, message);
 			UtilTextMiddle.display(message, null);
@@ -411,11 +422,10 @@ public class MineWare extends SoloGame
 
 			_orderTime = System.currentTimeMillis();
 			_orderWaiting = true;
-			/* XXX
-			GetObjectiveSide().setDisplayName(
-					ChatColor.WHITE + "§lMineWare " + C.cGreen + "§l"
-							+ "Round " + _orderCount);
-							*/
+			/*
+			 * XXX GetObjectiveSide().setDisplayName( ChatColor.WHITE +
+			 * "§lMineWare " + C.cGreen + "§l" + "Round " + _orderCount);
+			 */
 		}
 		else if (_orderWaiting)
 		{
@@ -427,7 +437,8 @@ public class MineWare extends SoloGame
 			_order.StartOrder();
 
 			// Register
-			UtilServer.getServer().getPluginManager().registerEvents(_order, Manager.getPlugin());
+			UtilServer.getServer().getPluginManager()
+					.registerEvents(_order, Manager.getPlugin());
 
 			sayChallenge(_order);
 		}
@@ -454,8 +465,10 @@ public class MineWare extends SoloGame
 
 				_order.EndOrder();
 
-				_lastOrderBlocks = new ArrayList<Block>(_order.getModifiedBlocks());
-				// Remove blocks from top to bottom, prevents blocks popping off.
+				_lastOrderBlocks = new ArrayList<Block>(
+						_order.getModifiedBlocks());
+				// Remove blocks from top to bottom, prevents blocks popping
+				// off.
 				Collections.sort(_lastOrderBlocks, new Comparator<Block>()
 				{
 
@@ -475,8 +488,10 @@ public class MineWare extends SoloGame
 				// Set Level
 				for (Player player : UtilServer.getPlayers())
 				{
-					UtilTextTop.display(C.cYellow + C.Bold + (IsAlive(player) ? _order.getMessage(player) : _order.GetOrder()),
-							player);
+					UtilTextTop.display(C.cYellow
+							+ C.Bold
+							+ (IsAlive(player) ? _order.getMessage(player)
+									: _order.GetOrder()), player);
 					player.setLevel(_order.GetRemainingPlaces());
 					player.setExp(_order.GetTimeLeftPercent());
 				}
@@ -509,13 +524,17 @@ public class MineWare extends SoloGame
 
 		if (lives > 0)
 		{
-			UtilPlayer.message(player, C.cRed + C.Bold + "You failed the task!");
-			UtilPlayer.message(player, C.cRed + C.Bold + "You have " + lives + " lives left!");
-			player.playSound(player.getLocation(), Sound.NOTE_BASS_GUITAR, 2f, 0.5f);
+			UtilPlayer
+					.message(player, C.cRed + C.Bold + "You failed the task!");
+			UtilPlayer.message(player, C.cRed + C.Bold + "You have " + lives
+					+ " lives left!");
+			player.playSound(player.getLocation(), Sound.NOTE_BASS_GUITAR, 2f,
+					0.5f);
 		}
 		else
 		{
-			UtilPlayer.message(player, C.cRed + C.Bold + "You are out of the game!");
+			UtilPlayer.message(player, C.cRed + C.Bold
+					+ "You are out of the game!");
 			player.playSound(player.getLocation(), Sound.EXPLODE, 2f, 1f);
 
 			Scoreboard.ResetScore(player.getName());
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeChickenFishing.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeChickenFishing.java
new file mode 100644
index 000000000..0e4a4b3db
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeChickenFishing.java
@@ -0,0 +1,125 @@
+package nautilus.game.arcade.game.games.mineware.challenges;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilShapes;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import nautilus.game.arcade.game.games.mineware.Challenge;
+import nautilus.game.arcade.game.games.mineware.MineWare;
+
+public class ChallengeChickenFishing extends Challenge
+{
+	private ArrayList<Entity> _chickens = new ArrayList<Entity>();
+	private ArrayList<Location> _spawns = new ArrayList<Location>();
+	private ArrayList<Location> _chickenSpawns = new ArrayList<Location>();
+
+	public ChallengeChickenFishing(MineWare host)
+	{
+		super(host, ChallengeType.FirstComplete, "Chicken Fishing");
+	}
+
+	@Override
+	public ArrayList<Location> getSpawns()
+	{
+		return _spawns;
+	}
+
+	@EventHandler
+	public void onSecond(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.FAST)
+		{
+			return;
+		}
+
+		Iterator<Entity> itel = _chickens.iterator();
+
+		while (itel.hasNext())
+		{
+			Entity ent = itel.next();
+
+			// TODO Validate chicken is caught
+
+			if (!ent.isValid())
+			{
+				itel.remove();
+			}
+		}
+
+		for (Player player : getChallengers())
+		{
+			Block block = player.getLocation().getBlock();
+
+			if (block.isLiquid())
+			{
+				setLost(player);
+			}
+		}
+	}
+
+	@Override
+	public void cleanupRoom()
+	{
+		for (Entity chicken : _chickens)
+		{
+			chicken.remove();
+		}
+	}
+
+	@Override
+	public void setupPlayers()
+	{
+		for (Player player : getChallengers())
+		{
+			player.getInventory().addItem(new ItemStack(Material.FISHING_ROD));
+		}
+	}
+
+	@Override
+	public void generateRoom()
+	{
+		int size = (getChallengers().size() / 2) + 4;
+
+		for (Location location : UtilShapes.getCircle(getCenter(), true, size))
+		{
+			Block block = location.getBlock();
+
+			for (int y = 0; y <= 7; y++)
+			{
+				Block b = block.getRelative(0, y, 0);
+
+				if (y < 3 || (y < 5 && UtilMath.random.nextBoolean()))
+				{
+					b.setType(Material.STONE);
+				}
+				else if (y != 7)
+				{
+					b.setType(Material.DIRT);
+				}
+				else
+				{
+					b.setType(Material.GRASS);
+				}
+			}
+
+			_spawns.add(location.clone().add(0.5, 7.1, 0.5));
+		}
+
+		for (Location location : UtilShapes.getCircle(getCenter(), false,
+				size - 1))
+		{
+			_chickenSpawns.add(location.add(0.5, 0.5, 0.5));
+		}
+	}
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeDragonEgg.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeDragonEgg.java
index b10c6b9f2..c472b72f3 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeDragonEgg.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeDragonEgg.java
@@ -55,7 +55,8 @@ public class ChallengeDragonEgg extends Challenge
 	@EventHandler
 	public void onBlockHit(PlayerInteractEvent event)
 	{
-		if (event.getAction() != Action.LEFT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_BLOCK)
+		if (event.getAction() != Action.LEFT_CLICK_BLOCK
+				&& event.getAction() != Action.RIGHT_CLICK_BLOCK)
 		{
 			return;
 		}
@@ -75,21 +76,25 @@ public class ChallengeDragonEgg extends Challenge
 		event.setCancelled(true);
 
 		block.setType(Material.AIR);
-		addBlock(block);
 
-		UtilParticle.PlayParticle(ParticleType.PORTAL, block.getLocation().add(0.5, 0.5, 0.5), 0.5F, 0.5F, 0.5F, 0, 11,
-				ViewDist.MAX, UtilServer.getPlayers());
+		UtilParticle.PlayParticle(ParticleType.PORTAL,
+				block.getLocation().add(0.5, 0.5, 0.5), 0.5F, 0.5F, 0.5F, 0,
+				11, ViewDist.MAX, UtilServer.getPlayers());
 
 		Host.CreatureAllowOverride = true;
 
 		for (int i = 0; i < 10; i++)
 		{
-			Block b = getCenter().clone().add(UtilMath.r(30) - 15, 1, UtilMath.r(30) - 15).getBlock();
+			Block b = getCenter().clone()
+					.add(UtilMath.r(30) - 15, 1, UtilMath.r(30) - 15)
+					.getBlock();
 
 			if (b.getType() == Material.AIR)
 			{
-				Entity entity = getCenter().getWorld().spawnFallingBlock(b.getLocation().add(0.5, 2, 0.5), Material.DRAGON_EGG,
+				Entity entity = getCenter().getWorld().spawnFallingBlock(
+						b.getLocation().add(0.5, 2, 0.5), Material.DRAGON_EGG,
 						(byte) 0);
+
 				_dragonEggs.add(entity);
 
 				for (int y = 0; y <= 2; y++)
@@ -107,9 +112,10 @@ public class ChallengeDragonEgg extends Challenge
 
 		int score = _smashedEggs.get(player.getName()) + 1;
 
-		displayCount(player, block.getLocation().add(0.5, 1, 0.5), (score >= 10 ? C.cDGreen : score >= 7 ? C.cGreen
-				: score >= 4 ? C.cRed : C.cDRed)
-				+ score);
+		displayCount(player, block.getLocation().add(0.5, 1, 0.5),
+				(score >= 10 ? C.cDGreen : score >= 7 ? C.cGreen
+						: score >= 4 ? C.cRed : C.cDRed)
+						+ score);
 
 		_smashedEggs.put(player.getName(), score);
 
@@ -136,7 +142,10 @@ public class ChallengeDragonEgg extends Challenge
 		for (Player player : getChallengers())
 		{
 			_smashedEggs.put(player.getName(), 0);
-			player.getInventory().setItem(0, new ItemBuilder(Material.IRON_AXE).setTitle(C.cWhite + "Egg Smasher").build());
+			player.getInventory().setItem(
+					0,
+					new ItemBuilder(Material.IRON_AXE).setTitle(
+							C.cWhite + "Egg Smasher").build());
 		}
 	}
 
@@ -157,7 +166,8 @@ public class ChallengeDragonEgg extends Challenge
 
 		for (int i = 0; i < 9; i++)
 		{
-			Block b = getCenter().getBlock().getRelative(UtilMath.r(30) - 15, 1, UtilMath.r(30) - 15);
+			Block b = getCenter().getBlock().getRelative(UtilMath.r(30) - 15,
+					1, UtilMath.r(30) - 15);
 			b.setType(Material.DRAGON_EGG);
 			addBlock(b);
 		}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeRunner.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeRunner.java
new file mode 100644
index 000000000..77c7ea2e0
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeRunner.java
@@ -0,0 +1,175 @@
+package nautilus.game.arcade.game.games.mineware.challenges;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+import mineplex.core.common.util.MapUtil;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilTime;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import nautilus.game.arcade.game.games.mineware.Challenge;
+import nautilus.game.arcade.game.games.mineware.MineWare;
+
+public class ChallengeRunner extends Challenge
+{
+	private ArrayList<Entity> _fallingBlocks = new ArrayList<Entity>();
+
+	public ChallengeRunner(MineWare host)
+	{
+		super(host, ChallengeType.LastStanding,
+				"Blocks are disappearing beneath you! Run away!");
+	}
+
+	@Override
+	public ArrayList<Location> getSpawns()
+	{
+		return _spawns;
+	}
+
+	@Override
+	public void cleanupRoom()
+	{
+		for (Entity ent : _fallingBlocks)
+		{
+			ent.remove();
+		}
+	}
+
+	@Override
+	public void setupPlayers()
+	{
+	}
+
+	private ArrayList<Location> _spawns = new ArrayList<Location>();
+
+	@Override
+	public void generateRoom()
+	{
+		int amount = (int) Math.ceil(Math.sqrt(getChallengers().size()));
+		int a = UtilMath.r(16);
+
+		for (int pX = 0; pX < amount; pX++)
+		{
+			for (int pZ = 0; pZ < amount; pZ++)
+			{
+				if (++a > 15)
+				{
+					a = 0;
+				}
+				else if (a == 14)
+				{
+					a++;
+				}
+
+				_spawns.add(getCenter()
+						.add((pX * 4) + 1.5, 1.1, (pZ * 4) + 1.5));
+
+				for (int x = pX * 4; x < (pX * 4) + 2; x++)
+				{
+					for (int z = pZ * 4; z < (pZ * 4) + 2; z++)
+					{
+						Block b = getCenter().getBlock().getRelative(x, 0, z);
+						b.setType(Material.STAINED_CLAY);
+						b.setData((byte) a);
+
+						addBlock(b);
+					}
+				}
+			}
+		}
+	}
+
+	@EventHandler
+	public void BlockBreak(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+
+		// Add Blocks
+		for (Player player : getChallengers())
+		{
+			// Side Standing
+			double xMod = player.getLocation().getX() % 1;
+			if (player.getLocation().getX() < 0)
+				xMod += 1;
+
+			double zMod = player.getLocation().getZ() % 1;
+			if (player.getLocation().getZ() < 0)
+				zMod += 1;
+
+			int xMin = 0;
+			int xMax = 0;
+			int zMin = 0;
+			int zMax = 0;
+
+			if (xMod < 0.3)
+				xMin = -1;
+			if (xMod > 0.7)
+				xMax = 1;
+
+			if (zMod < 0.3)
+				zMin = -1;
+			if (zMod > 0.7)
+				zMax = 1;
+
+			for (int x = xMin; x <= xMax; x++)
+			{
+				for (int z = zMin; z <= zMax; z++)
+				{
+					AddBlock(player.getLocation().add(x, -0.5, z).getBlock());
+				}
+			}
+		}
+
+		Iterator<Block> blockIterator = _blocks.keySet().iterator();
+
+		while (blockIterator.hasNext())
+		{
+			Block block = blockIterator.next();
+
+			if (!UtilTime.elapsed(_blocks.get(block), 600))
+				continue;
+
+			// Fall
+			int id = block.getTypeId();
+			byte data = block.getData();
+			MapUtil.QuickChangeBlockAt(block.getLocation(), Material.AIR);
+			FallingBlock ent = block.getWorld().spawnFallingBlock(
+					block.getLocation(), id, data);
+			_fallingBlocks.add(ent);
+
+			blockIterator.remove();
+		}
+	}
+
+	public void AddBlock(Block block)
+	{
+		if (block == null || block.getTypeId() == 0 || block.getTypeId() == 7
+				|| block.isLiquid())
+			return;
+
+		if (block.getRelative(BlockFace.UP).getTypeId() != 0)
+			return;
+
+		if (_blocks.containsKey(block))
+			return;
+
+		_blocks.put(block, System.currentTimeMillis());
+
+		block.setTypeIdAndData(159, (byte) 14, false);
+	}
+
+	private HashMap<Block, Long> _blocks = new HashMap<Block, Long>();
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeSpleef.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeSpleef.java
new file mode 100644
index 000000000..3619626c2
--- /dev/null
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeSpleef.java
@@ -0,0 +1,103 @@
+package nautilus.game.arcade.game.games.mineware.challenges;
+
+import java.util.ArrayList;
+
+import org.bukkit.Effect;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.common.util.UtilPlayer;
+import nautilus.game.arcade.game.games.mineware.Challenge;
+import nautilus.game.arcade.game.games.mineware.MineWare;
+
+public class ChallengeSpleef extends Challenge
+{
+
+	public ChallengeSpleef(MineWare host)
+	{
+		super(host, ChallengeType.LastStanding,
+				"Destroy the blocks beneath other players!");
+	}
+
+	@Override
+	public ArrayList<Location> getSpawns()
+	{
+		ArrayList<Location> spawns = new ArrayList<Location>();
+
+		for (int x = -7; x <= 7; x++)
+		{
+			for (int z = -7; z <= 7; z++)
+			{
+				spawns.add(getCenter().clone().add(x + 0.5, 2, z + 0.5));
+			}
+		}
+
+		return spawns;
+	}
+
+	@Override
+	public void cleanupRoom()
+	{
+	}
+
+	@Override
+	public void setupPlayers()
+	{
+	}
+
+	@EventHandler
+	public void onBreak(PlayerInteractEvent event)
+	{
+		if (event.getAction() != Action.LEFT_CLICK_BLOCK)
+		{
+			return;
+		}
+
+		if (UtilPlayer.isSpectator(event.getPlayer()))
+		{
+			return;
+		}
+
+		Block block = event.getClickedBlock();
+		block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND,
+				block.getTypeId());
+		block.setType(Material.AIR);
+	}
+
+	@Override
+	public void generateRoom()
+	{
+		for (int x = -15; x <= 15; x++)
+		{
+			for (int z = -15; z <= 15; z++)
+			{
+				Block block = getCenter().getBlock().getRelative(x, 0, z);
+				block.setType(Material.LAVA);
+				addBlock(block);
+
+				if (Math.abs(x) <= 10 && Math.abs(z) <= 10)
+				{
+					Block b = block.getRelative(0, 5, 0);
+
+					if (Math.abs(x) == 10 || Math.abs(z) == 10)
+					{
+						b.setType(Material.IRON_BLOCK);
+					}
+					else
+					{
+						b.setType(Material.WOOL);
+						block.setData((byte) UtilMath.r(16));
+					}
+
+					addBlock(b);
+				}
+			}
+		}
+	}
+
+}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeVolleyPig.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeVolleyPig.java
index 93a339237..ce69eba1f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeVolleyPig.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeVolleyPig.java
@@ -36,7 +36,7 @@ public class ChallengeVolleyPig extends Challenge
 
 	public ChallengeVolleyPig(MineWare host)
 	{
-		super(host, ChallengeType.LastStanding, "Keep the pig on the other side and stack up the time!");
+		super(host, ChallengeType.FirstComplete, "Keep the pig on the other side and stack up the time!");
 	}
 
 	@Override

From 5babd8a41a6d2c41b31288413dc3d3e71d27a46d Mon Sep 17 00:00:00 2001
From: Sarah <xXVevzZZXx@gmail.com>
Date: Thu, 9 Jul 2015 03:45:57 +0200
Subject: [PATCH 5/5] Fix number formatting for different system locale

---
 .../src/mineplex/core/common/util/UtilMath.java           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
index 2ba63686b..c3513308c 100644
--- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
+++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
@@ -1,6 +1,9 @@
 package mineplex.core.common.util;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
+import java.util.Locale;
 import java.util.Random;
 
 import org.bukkit.Location;
@@ -15,8 +18,9 @@ public class UtilMath
 		
 		for (int i=1 ; i<degree ; i++)
 			format += "#";
-		
-		DecimalFormat twoDForm = new DecimalFormat(format);
+
+		DecimalFormatSymbols symb = new DecimalFormatSymbols(Locale.US);
+		DecimalFormat twoDForm = new DecimalFormat(format, symb);
 		return Double.valueOf(twoDForm.format(d));
 	}