From 00b5c6f3d46ed5a1128d2ef26eefb16bbaf54975 Mon Sep 17 00:00:00 2001
From: Aaron Brock <TheMineBench@gmail.com>
Date: Sat, 4 Jul 2015 03:01:56 -0400
Subject: [PATCH 1/2] Fixing/adding some things.

Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
---
 Pocket/plugins/Mineplex/src/Test.php          | 18 ++--
 .../countdown/GameStateCountdown.php          |  4 -
 .../feature/GameStateFeatureManager.php       | 87 +++++++++++++++++--
 .../feature/features/NoBlockBreak.php         |  3 +
 .../feature/features/NoMovement.php           | 63 ++++++++++++++
 .../gamestate/GameStateComponent.php          | 16 +++-
 .../plugin/bench/game/games/pvp/Pvp.php       | 20 +++--
 7 files changed, 187 insertions(+), 24 deletions(-)
 create mode 100644 Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoMovement.php

diff --git a/Pocket/plugins/Mineplex/src/Test.php b/Pocket/plugins/Mineplex/src/Test.php
index 1a14d662a..7775713b2 100644
--- a/Pocket/plugins/Mineplex/src/Test.php
+++ b/Pocket/plugins/Mineplex/src/Test.php
@@ -1,17 +1,23 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: Exerosis
+ * User: TheMineBench
  * Date: 7/1/2015
  * Time: 1:25 PM
  */
 
-$array = array('1','2','3','4','5');
 
-foreach ($array as $key => $moo)
+function myfunction($a,$b)
 {
-    if ($moo == '2')
-        unset ($array[$key]);
+    if ($a===$b)
+    {
+        return 0;
+    }
+    return ($a>$b)?1:-1;
 }
 
-print_r($array);
\ No newline at end of file
+$a1=array(new stdClass(),"b"=>"green","c"=>"blue");
+$a2=array("a"=>"blue","b"=>"black","e"=>"blue");
+
+$result=array_udiff($a1,$a2,"myfunction");
+print_r($result);
\ No newline at end of file
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/countdown/GameStateCountdown.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/countdown/GameStateCountdown.php
index ff0565c7f..3ad507c14 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/countdown/GameStateCountdown.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/countdown/GameStateCountdown.php
@@ -48,9 +48,6 @@ class GameStateCountdown implements Listener, BenchTask {
         if ($event->getArena() !== $this->arena)
             return;
 
-        Server::getInstance()->broadcastMessage("ToGameState:".(string)$event->getToGameState());
-        Server::getInstance()->broadcastMessage("StartGameState: $this->startGameState");
-
         if ($event->getToGameState() == $this->startGameState)
         {
             BenchSchedule::runTaskTimer($this, 1000, 1000);
@@ -83,7 +80,6 @@ class GameStateCountdown implements Listener, BenchTask {
             $this->gameStateComponent->setGameState($this->setGameState);
             $data->end();
         }
-
     }
 
     public function popup()
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/GameStateFeatureManager.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/GameStateFeatureManager.php
index 6273e2d69..ac5fd8a68 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/GameStateFeatureManager.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/GameStateFeatureManager.php
@@ -44,22 +44,97 @@ class GameStateFeatureManager implements Listener {
         if ($event->getArena() !== $this->arena)
             return;
 
-        $lastFeatures = $this->features[$event->getFromGameState()];
-        $theseFeatures = $this->features[$event->getToGameState()];
+        /** @var Feature[] $lastFeatures */
 
-        $toEnable = array_diff($theseFeatures, $lastFeatures);
-        $toDisable = array_diff($lastFeatures, $theseFeatures);
+        if (isset($this->features[$event->getFromGameState()]) || array_key_exists($event->getFromGameState(), $this->features))
+            $lastFeatures = $this->features[$event->getFromGameState()];
+        else
+            $lastFeatures = [];
+
+
+        /** @var Feature[] $theseFeatures */
+
+        if (isset($this->features[$event->getToGameState()]) || array_key_exists($event->getToGameState(), $this->features))
+            $theseFeatures = $this->features[$event->getToGameState()];
+        else
+            $theseFeatures = [];
+
+
+
+        /** @var Feature[] $toEnable */
+        $toEnable = array_udiff($theseFeatures, $lastFeatures, array($this, 'comp'));
+
+        /** @var Feature[] $toDisable */
+        $toDisable = array_udiff($lastFeatures, $theseFeatures, array($this, 'comp'));
 
         foreach ($toEnable as $feature) {
-            //$feature->
+            if (!$feature->isEnabled())
+                $feature->enable();
         }
 
+        foreach ($toDisable as $feature) {
+            if ($feature->isEnabled())
+                $feature->disable();
+        }
     }
 
     public function onEnd(ArenaEndEvent $event)
     {
         if ($event->getArena() !== $this->arena)
             return;
+
+        /** @var Feature[] $iterator */
+        $iterator = new RecursiveIteratorIterator(new RecursiveArrayIterator($this->features));
+
+        foreach ($iterator as $feature) {
+            if ($feature->isEnabled())
+                $feature->disable();
+        }
+
         HandlerList::unregisterAll($this);
     }
-}
\ No newline at end of file
+
+    function comp($a,$b)
+    {
+        if ($a===$b)
+        {
+            return 0;
+        }
+        return ($a>$b)?1:-1;
+    }
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoBlockBreak.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoBlockBreak.php
index e69533750..2d61edcd6 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoBlockBreak.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoBlockBreak.php
@@ -35,15 +35,18 @@ class NoBlockBreak implements Feature, Listener {
 
     public function enable()
     {
+        Server::getInstance()->broadcastMessage("Enabled!");
         $this->enabled = true;
         Server::getInstance()->getPluginManager()->registerEvents($this, $this->arena->getPlugin());
     }
 
     public function disable()
     {
+        Server::getInstance()->broadcastMessage("Disabled!");
         $this->enabled = false;
         HandlerList::unregisterAll($this);
     }
+
     public function isEnabled()
     {
         return $this->enabled;
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoMovement.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoMovement.php
new file mode 100644
index 000000000..ed3a5bf66
--- /dev/null
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoMovement.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Exerosis
+ * Date: 7/1/2015
+ * Time: 10:20 PM
+ */
+
+namespace mineplex\plugin\bench\game\components\feature\features;
+
+use mineplex\plugin\bench\arenas\Arena;
+use mineplex\plugin\bench\game\components\feature\Feature;
+use pocketmine\entity\Effect;
+use pocketmine\event\block\BlockBreakEvent;
+use pocketmine\event\HandlerList;
+use pocketmine\event\Listener;
+use pocketmine\Player;
+use pocketmine\Server;
+
+class NoMovement implements Feature, Listener {
+
+    private $arena;
+    private $enabled = false;
+
+
+    public function __construct(Arena $arena)
+    {
+        $this->arena = $arena;
+    }
+
+    public function onBlockBreak(BlockBreakEvent $event)
+    {
+        if (!in_array($event->getPlayer(), $this->arena->getPlayers()))
+            return;
+
+
+
+        $event->setCancelled(true);
+
+
+
+    }
+
+
+
+    public function enable()
+    {
+        $this->enabled = true;
+        Server::getInstance()->getPluginManager()->registerEvents($this, $this->arena->getPlugin());
+    }
+
+    public function disable()
+    {
+        Server::getInstance()->broadcastMessage("Disabled!");
+        $this->enabled = false;
+        HandlerList::unregisterAll($this);
+    }
+
+    public function isEnabled()
+    {
+        return $this->enabled;
+    }
+}
\ No newline at end of file
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/GameStateComponent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/GameStateComponent.php
index 00f9c8036..ea79c9141 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/GameStateComponent.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/GameStateComponent.php
@@ -37,12 +37,16 @@ class GameStateComponent implements Listener {
         $this->setGameState(GameState::LOBBY);
     }
 
+    /**
+     * @priority LOW
+     * @param ArenaEndEvent $event
+     */
     public function onEnd(ArenaEndEvent $event)
     {
         if ($event->getArena() !== $this->arena)
             return;
         HandlerList::unregisterAll($this);
-        $this->setGameState(GameState::RESTARTING);
+        $this->localSetState(GameState::RESTARTING);
     }
 
 
@@ -64,13 +68,19 @@ class GameStateComponent implements Listener {
             return true;
         }
 
+        $this->localSetState($gameState);
+
+        return true;
+    }
+
+    private function localSetState($gameState)
+    {
+
         $event = new GameStateChangeEvent($this->arena, $this->gameState, $gameState);
 
         //Not sure if I should call the event before of after...
         Server::getInstance()->getPluginManager()->callEvent($event);
         $this->gameState = $gameState;
-
-        return true;
     }
 
     public function getGameState()
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/pvp/Pvp.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/pvp/Pvp.php
index 4b1d25002..1b7837765 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/pvp/Pvp.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/pvp/Pvp.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: Exerosis
+ * User: TheMineBench
  * Date: 6/30/2015
  * Time: 9:18 PM
  */
@@ -9,11 +9,13 @@ namespace mineplex\plugin\bench\game\games\pvp;
 
 use mineplex\plugin\bench\game\components\countdown\GameStateCountdown;
 use mineplex\plugin\bench\game\components\feature\features\NoBlockBreak;
+use mineplex\plugin\bench\game\components\feature\GameStateFeatureManager;
 use mineplex\plugin\bench\game\components\gamestate\GameState;
 use mineplex\plugin\bench\game\components\gamestate\GameStateComponent;
 use pocketmine\event\Listener;
 use mineplex\plugin\bench\game\Game;
 use mineplex\plugin\bench\arenas\Arena;
+use mineplex\plugin\bench\game\components\feature\Feature;
 
 class Pvp implements Game, Listener {
 
@@ -21,16 +23,24 @@ class Pvp implements Game, Listener {
     {
         $gameStateComponent = new GameStateComponent($arena);
 
-        array(
+        $noBlockBreak = new NoBlockBreak($arena);
+
+        /** @var Feature[][] $features */
+        $features = array(
+            GameState::LOBBY => array($noBlockBreak),
+            GameState::PRE_GAME => array($noBlockBreak),
+            GameState::POST_GAME => array($noBlockBreak),
         );
 
+        new GameStateFeatureManager($arena, $features);
+
         new GameStateCountdown($arena, $gameStateComponent, 20, GameState::LOBBY, GameState::PRE_GAME);
 
-        //new GameStateCountdown($arena, $gameStateComponent, 10, GameState::PRE_GAME, GameState::GAME);
+        new GameStateCountdown($arena, $gameStateComponent, 10, GameState::PRE_GAME, GameState::GAME);
 
-        //new GameStateCountdown($arena, $gameStateComponent, 30, GameState::GAME, GameState::POST_GAME);
+        new GameStateCountdown($arena, $gameStateComponent, 30, GameState::GAME, GameState::POST_GAME);
 
-        //new GameStateCountdown($arena, $gameStateComponent, 10, GameState::POST_GAME, GameState::RESTARTING);
+        new GameStateCountdown($arena, $gameStateComponent, 10, GameState::POST_GAME, GameState::RESTARTING);
     }
 
 }
\ No newline at end of file

From 514fe4a18a6124f0dfc29dbe9dd273ea5e294c10 Mon Sep 17 00:00:00 2001
From: Aaron Brock <TheMineBench@gmail.com>
Date: Sat, 4 Jul 2015 20:59:15 -0400
Subject: [PATCH 2/2] Added some stuff.

Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
---
 .../Mineplex/src/mineplex/plugin/Main.php     |  79 +++-----------
 .../mineplex/plugin/bench/arenas/Arena.php    |  10 +-
 .../plugin/bench/arenas/ArenaEvent.php        |   2 +-
 .../plugin/bench/arenas/MultiGameArena.php    | 102 ++++++++++++++++++
 .../plugin/bench/arenas/SingleGameArena.php   |   3 +-
 .../bench/arenas/events/ArenaCanJoinEvent.php |   2 +-
 .../bench/arenas/events/ArenaEndEvent.php     |   2 +-
 .../bench/arenas/events/ArenaJoinEvent.php    |   2 +-
 .../bench/arenas/events/ArenaQuitEvent.php    |   2 +-
 .../bench/arenas/events/ArenaStartEvent.php   |   2 +-
 .../countdown/GameStateCountdown.php          |  12 ++-
 .../bench/game/components/feature/Feature.php |   2 +-
 .../feature/GameStateFeatureManager.php       |   6 +-
 .../feature/features/NoBlockBreak.php         |  36 ++++++-
 .../feature/features/NoMovement.php           |   2 +-
 .../game/components/gamestate/GameState.php   |   2 +-
 .../plugin/bench/game/factory/GameFactory.php |  18 ++++
 .../bench/game/factory/TestGameFactory.php    |  20 ++++
 .../plugin/bench/game/games/pvp/Pvp.php       |   6 +-
 .../bench/game/games/sg/SurvivalGames.php     |  46 ++++++++
 20 files changed, 268 insertions(+), 88 deletions(-)
 create mode 100644 Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/MultiGameArena.php
 create mode 100644 Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/factory/GameFactory.php
 create mode 100644 Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/factory/TestGameFactory.php
 create mode 100644 Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/sg/SurvivalGames.php

diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/Main.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/Main.php
index e9d7f1cd4..fec53f2c5 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/Main.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/Main.php
@@ -2,24 +2,26 @@
 
 namespace mineplex\plugin;
 
-
-use mineplex\plugin\bench\arenas\SingleGameArena;
-use mineplex\plugin\core\updater\UpdateEvent;
-use mineplex\plugin\bench\game\games\pvp\Pvp;
-use mineplex\plugin\packets\StrangePacket;
-use mineplex\plugin\util\UtilString;
+use mineplex\plugin\bench\arenas\MultiGameArena;
+use mineplex\plugin\bench\game\factory\TestGameFactory;
 use pocketmine\event\Listener;
-use pocketmine\event\player\PlayerCommandPreprocessEvent;
 use pocketmine\event\player\PlayerJoinEvent;
+use pocketmine\event\player\PlayerLoginEvent;
+use pocketmine\event\player\PlayerQuitEvent;
 use pocketmine\plugin\PluginBase;
+use mineplex\plugin\bench\arenas\Arena;
 use pocketmine\Server;
 
 class Main extends PluginBase implements Listener
 {
+    /** @var Arena */
+    private $arena;
+
     public function onEnable()
     {
-        new SingleGameArena($this, new Pvp());
 
+        $this->arena = new MultiGameArena($this, new TestGameFactory());
+        Server::getInstance()->getPluginManager()->registerEvents($this, $this);
 
         //$this->getServer()->getScheduler()->scheduleRepeatingTask(new TickTask($this), 1);
 
@@ -27,64 +29,17 @@ class Main extends PluginBase implements Listener
         //new Updater($this);
     }
 
-    public function onDisable()
+    public function onLogin(PlayerLoginEvent $event)
     {
+        if ($this->arena->canJoin($event->getPlayer()))
+            retun;
 
+        $event->setKickMessage("Unable to join game!");
+        $event->setCancelled();
     }
 
-    public function joinMessage(PlayerJoinEvent $event)
+    public function onJoin(PlayerJoinEvent $event)
     {
-        $name = $event->getPlayer()->getName();
-
-        $player = Server::getInstance()->getPlayer($name);
-
-        $event->setJoinMessage($player->getName());
-    }
-
-    public function onPlayerJoin(PlayerJoinEvent $event)
-    {
-        $event->getPlayer()->sendMessage("Welcome to the server " . $event->getPlayer()->getName() . "!");
-
-        $this->getLogger()->info($event->getPlayer()->getName() . " UID: " . $event->getPlayer()->getUniqueId());
-
-        if (UtilString::startsWith( $event->getPlayer()->getName(), "chissling"))
-        {
-            $event->getPlayer()->setNameTag("// chiss //");
-            $event->getPlayer()->setDisplayName("// chiss //");
-        }
-    }
-
-    public function onPlayerCommand(PlayerCommandPreprocessEvent $event)
-    {
-        if (UtilString::startsWith($event->getMessage(), "/mineplex"))
-        {
-            $event->setCancelled(true);
-
-            $event->getPlayer()->sendMessage("Sending you to: MINEPLEX");
-
-            $packet = new StrangePacket();
-            $packet->address = "69.175.104.154";
-
-            $event->getPlayer()->directDataPacket($packet);
-        }
-
-        if (UtilString::startsWith($event->getMessage(), "/ip "))
-        {
-            $event->setCancelled(true);
-
-            $ip = substr($event->getMessage(), 4, strlen($event->getMessage()));
-
-            $event->getPlayer()->sendMessage("Sending you to: " . $ip);
-
-            $packet = new StrangePacket();
-            $packet->address = $ip;
-
-            $event->getPlayer()->directDataPacket($packet);
-        }
-    }
-
-    public function onTick(UpdateEvent $event)
-    {
-
+        $this->arena->addPlayer($event->getPlayer());
     }
 }
\ No newline at end of file
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/Arena.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/Arena.php
index dc266e03e..8d7165749 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/Arena.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/Arena.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: Exerosis
+ * User: Bench
  * Date: 6/30/2015
  * Time: 1:35 PM
  */
@@ -12,7 +12,13 @@ use pocketmine\Player;
 
 interface Arena
 {
-    public function getCurrentGame();
+    /**
+     * @param Player $player
+     * @return bool
+     */
+    public function canJoin(Player $player);
+    public function addPlayer(Player $player);
+    public function removePlayer(Player $player);
 
     /**
      * @return Player[]
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/ArenaEvent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/ArenaEvent.php
index c0b1b9813..ef0f8dac0 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/ArenaEvent.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/ArenaEvent.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: Exerosis
+ * User: Bench
  * Date: 6/30/2015
  * Time: 9:06 PM
  */
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/MultiGameArena.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/MultiGameArena.php
new file mode 100644
index 000000000..660d4e60d
--- /dev/null
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/MultiGameArena.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Bench
+ * Date: 7/4/2015
+ * Time: 12:14 PM
+ */
+
+namespace mineplex\plugin\bench\arenas;
+
+use mineplex\plugin\bench\arenas\events\ArenaEndEvent;
+use mineplex\plugin\bench\game\factory\GameFactory;
+use pocketmine\event\Listener;
+use pocketmine\plugin\Plugin;
+use pocketmine\event\player\PlayerJoinEvent;
+use pocketmine\event\player\PlayerQuitEvent;
+use pocketmine\Player;
+use pocketmine\Server;
+use mineplex\plugin\bench\game\Game;
+use mineplex\plugin\bench\arenas\events\ArenaCanJoinEvent;
+use mineplex\plugin\bench\arenas\events\ArenaJoinEvent;
+use mineplex\plugin\bench\arenas\events\ArenaQuitEvent;
+use mineplex\plugin\bench\arenas\events\ArenaStartEvent;
+
+
+class MultiGameArena implements Arena, Listener
+{
+
+    /** @var Player[] */
+    private $players = array();
+
+    private $plugin;
+
+    private $gameFactory;
+    private $game;
+
+
+    public function __construct(Plugin $plugin, GameFactory $gameFactory)
+    {
+        Server::getInstance()->getPluginManager()->registerEvents($this, $plugin);
+        $this->gameFactory = $gameFactory;
+        $this->plugin = $plugin;
+        $this->startGame();
+    }
+
+    public function canJoin(Player $player)
+    {
+        $event = new ArenaCanJoinEvent($this, $player);
+        $this->plugin->getServer()->getPluginManager()->callEvent($event);
+        return !$event->isCancelled();
+    }
+
+    public function addPlayer(Player $player)
+    {
+        $this->plugin->getServer()->getPluginManager()->callEvent(new ArenaJoinEvent($this, $player));
+        array_push($this->players, $player);
+    }
+
+    public function removePlayer(Player $player)
+    {
+        if (($key = array_search($player, $this->players, true)) !== FALSE) {
+            unset($this->players[$key]);
+        }
+        Server::getInstance()->broadcastMessage("Calling ArenaQuitEvent");
+        $this->plugin->getServer()->getPluginManager()->callEvent(new ArenaQuitEvent($this, $player));
+    }
+
+    public function onQuit(PlayerQuitEvent $event)
+    {
+        $this->removePlayer($event->getPlayer());
+    }
+
+
+    public function endGame()
+    {
+        Server::getInstance()->getPluginManager()->callEvent(new ArenaEndEvent($this));
+        $this->startGame();
+    }
+
+    private function startGame()
+    {
+        $this->game = $this->gameFactory->getGame();
+        $this->game->start($this);
+        Server::getInstance()->getPluginManager()->callEvent(new ArenaStartEvent($this));
+    }
+
+
+    public function getPlayers()
+    {
+        return $this->players;
+    }
+
+    public function getCurrentGame()
+    {
+        return $this->game;
+    }
+
+    public function getPlugin()
+    {
+        return $this->plugin;
+    }
+}
\ No newline at end of file
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/SingleGameArena.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/SingleGameArena.php
index bb6bb0dff..b5fefc275 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/SingleGameArena.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/SingleGameArena.php
@@ -31,7 +31,6 @@ class SingleGameArena implements Arena, Listener {
 
     public function __construct(Plugin $plugin, Game $game)
     {
-        print 'SimpleGameArena Created!';
         Server::getInstance()->getPluginManager()->registerEvents($this, $plugin);
         $this->game = $game;
         $this->plugin = $plugin;
@@ -100,7 +99,7 @@ class SingleGameArena implements Arena, Listener {
         foreach ($this->players as $player)
         {
             Server::getInstance()->broadcastMessage((string)$player->getName());
-            $player->kick('Game Over...');
+            $player->kick('Game Over...', false);
         }
     }
 
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaCanJoinEvent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaCanJoinEvent.php
index 371365268..f45b71c7f 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaCanJoinEvent.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaCanJoinEvent.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: Exerosis
+ * User: Bench
  * Date: 6/30/2015
  * Time: 9:22 PM
  */
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaEndEvent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaEndEvent.php
index 22c1b48a7..241f4bcfb 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaEndEvent.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaEndEvent.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: Exerosis
+ * User: Bench
  * Date: 6/30/2015
  * Time: 10:12 PM
  */
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaJoinEvent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaJoinEvent.php
index 608bfea59..c0d3adbc2 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaJoinEvent.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaJoinEvent.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: Exerosis
+ * User: Bench
  * Date: 6/30/2015
  * Time: 9:22 PM
  */
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaQuitEvent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaQuitEvent.php
index 76efec5dd..8c225b1fd 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaQuitEvent.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaQuitEvent.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: Exerosis
+ * User: Bench
  * Date: 6/30/2015
  * Time: 9:22 PM
  */
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaStartEvent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaStartEvent.php
index 2fd03a23b..dd3db8d24 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaStartEvent.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaStartEvent.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: Exerosis
+ * User: Bench
  * Date: 6/30/2015
  * Time: 10:12 PM
  */
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/countdown/GameStateCountdown.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/countdown/GameStateCountdown.php
index 3ad507c14..b5ec2ad92 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/countdown/GameStateCountdown.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/countdown/GameStateCountdown.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: Exerosis
+ * User: TheMineBench
  * Date: 7/1/2015
  * Time: 5:52 PM
  */
@@ -71,15 +71,17 @@ class GameStateCountdown implements Listener, BenchTask {
     {
         print "Count: $this->count"."\n";
 
-        $this->popup();
-
-        $this->count--;
-
         if ($this->count <= 0)
         {
             $this->gameStateComponent->setGameState($this->setGameState);
             $data->end();
         }
+
+        $this->popup();
+
+        $this->count--;
+
+
     }
 
     public function popup()
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/Feature.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/Feature.php
index 026352b4b..e5e2d02e1 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/Feature.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/Feature.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: Exerosis
+ * User: TheMineBench
  * Date: 7/1/2015
  * Time: 10:18 PM
  */
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/GameStateFeatureManager.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/GameStateFeatureManager.php
index ac5fd8a68..6564c99fb 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/GameStateFeatureManager.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/GameStateFeatureManager.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: Exerosis
+ * User: TheMineBench
  * Date: 7/2/2015
  * Time: 12:44 AM
  */
@@ -16,6 +16,8 @@ use mineplex\plugin\bench\game\components\gamestate\GameState;
 use pocketmine\event\HandlerList;
 use pocketmine\event\Listener;
 use pocketmine\Server;
+use RecursiveArrayIterator;
+use RecursiveIteratorIterator;
 
 class GameStateFeatureManager implements Listener {
 
@@ -83,7 +85,7 @@ class GameStateFeatureManager implements Listener {
         if ($event->getArena() !== $this->arena)
             return;
 
-        /** @var Feature[] $iterator */
+
         $iterator = new RecursiveIteratorIterator(new RecursiveArrayIterator($this->features));
 
         foreach ($iterator as $feature) {
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoBlockBreak.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoBlockBreak.php
index 2d61edcd6..15344a34e 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoBlockBreak.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoBlockBreak.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: Exerosis
+ * User: TheMineBench
  * Date: 7/1/2015
  * Time: 10:20 PM
  */
@@ -17,12 +17,38 @@ use pocketmine\Server;
 
 class NoBlockBreak implements Feature, Listener {
 
+    /** @var  Arena */
     private $arena;
+
+    /** @var  int[] */
+    private $ids = [];
+
+    /** @var  bool */
+    private $black;
+
+    /** @var bool */
     private $enabled = false;
 
-
-    public function __construct(Arena $arena)
+    /**
+     * @param Arena $arena
+     * @param int[] $ids
+     * @param bool $black
+     */
+    public function __construct(Arena $arena, array $ids = null, $black = false)
     {
+        if ($ids != null) {
+            $this->ids = array_flip($ids);
+            foreach ($this->ids as $key => $value)
+            {
+                print "Key:" . $key;
+            }
+        }
+        print "\n" . "Black: " . (($black) ? 'true' : 'false') . "\n";
+
+        $this->black = $black;
+
+        print "\n" . "SetBlackList: " . (($this->black) ? 'true' : 'false') . "\n";
+
         $this->arena = $arena;
     }
 
@@ -30,7 +56,9 @@ class NoBlockBreak implements Feature, Listener {
     {
         if (!in_array($event->getPlayer(), $this->arena->getPlayers()))
             return;
-        $event->setCancelled(true);
+
+        if ($this->black == (isset($this->ids[$event->getBlock()->getId()]) || array_key_exists($event->getBlock()->getId(), $this->ids)))
+            $event->setCancelled();
     }
 
     public function enable()
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoMovement.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoMovement.php
index ed3a5bf66..e1994b845 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoMovement.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoMovement.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: Exerosis
+ * User: TheMineBench
  * Date: 7/1/2015
  * Time: 10:20 PM
  */
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/GameState.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/GameState.php
index 46413d66d..92d72f974 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/GameState.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/GameState.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Created by PhpStorm.
- * User: Exerosis
+ * User: TheMineBench
  * Date: 7/1/2015
  * Time: 10:33 AM
  */
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/factory/GameFactory.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/factory/GameFactory.php
new file mode 100644
index 000000000..2b2b97455
--- /dev/null
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/factory/GameFactory.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Exerosis
+ * Date: 7/4/2015
+ * Time: 1:12 PM
+ */
+
+namespace mineplex\plugin\bench\game\factory;
+
+use mineplex\plugin\bench\game\Game;
+
+interface GameFactory {
+    /**
+     * @return Game
+     */
+    public function getGame();
+}
\ No newline at end of file
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/factory/TestGameFactory.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/factory/TestGameFactory.php
new file mode 100644
index 000000000..953b81b0b
--- /dev/null
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/factory/TestGameFactory.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Exerosis
+ * Date: 7/4/2015
+ * Time: 3:03 PM
+ */
+
+namespace mineplex\plugin\bench\game\factory;
+
+
+use mineplex\plugin\bench\game\games\sg\SurvivalGames;
+
+class TestGameFactory implements GameFactory {
+
+    function getGame()
+    {
+        return new SurvivalGames();
+    }
+}
\ No newline at end of file
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/pvp/Pvp.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/pvp/Pvp.php
index 1b7837765..8c4d1a137 100644
--- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/pvp/Pvp.php
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/pvp/Pvp.php
@@ -16,6 +16,7 @@ use pocketmine\event\Listener;
 use mineplex\plugin\bench\game\Game;
 use mineplex\plugin\bench\arenas\Arena;
 use mineplex\plugin\bench\game\components\feature\Feature;
+use pocketmine\item\Item;
 
 class Pvp implements Game, Listener {
 
@@ -23,13 +24,14 @@ class Pvp implements Game, Listener {
     {
         $gameStateComponent = new GameStateComponent($arena);
 
-        $noBlockBreak = new NoBlockBreak($arena);
+        $noBlockBreak = new NoBlockBreak($arena, array(Item::GRASS));
 
         /** @var Feature[][] $features */
         $features = array(
             GameState::LOBBY => array($noBlockBreak),
             GameState::PRE_GAME => array($noBlockBreak),
-            GameState::POST_GAME => array($noBlockBreak),
+            GameState::GAME => array($noBlockBreak),
+            GameState::POST_GAME => array($noBlockBreak)
         );
 
         new GameStateFeatureManager($arena, $features);
diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/sg/SurvivalGames.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/sg/SurvivalGames.php
new file mode 100644
index 000000000..21066e32d
--- /dev/null
+++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/sg/SurvivalGames.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Exerosis
+ * Date: 7/4/2015
+ * Time: 3:09 PM
+ */
+
+namespace mineplex\plugin\bench\game\games\sg;
+
+use mineplex\plugin\bench\game\components\countdown\GameStateCountdown;
+use mineplex\plugin\bench\game\components\feature\features\NoBlockBreak;
+use mineplex\plugin\bench\game\components\feature\GameStateFeatureManager;
+use mineplex\plugin\bench\game\components\gamestate\GameState;
+use mineplex\plugin\bench\game\components\gamestate\GameStateComponent;
+use mineplex\plugin\bench\game\Game;
+use mineplex\plugin\bench\arenas\Arena;
+use mineplex\plugin\bench\game\components\feature\Feature;
+use pocketmine\item\Item;
+
+class SurvivalGames implements Game {
+
+    function start(Arena $arena)
+    {
+        $gameStateComponent = new GameStateComponent($arena);
+
+        $noBlockBreak = new NoBlockBreak($arena, array(Item::GRASS));
+
+        /** @var Feature[][] $features */
+        $features = array(
+            GameState::LOBBY => array($noBlockBreak),
+            GameState::PRE_GAME => array($noBlockBreak),
+            GameState::POST_GAME => array($noBlockBreak)
+        );
+
+        new GameStateFeatureManager($arena, $features);
+
+        new GameStateCountdown($arena, $gameStateComponent, 20, GameState::LOBBY, GameState::PRE_GAME);
+
+        new GameStateCountdown($arena, $gameStateComponent, 10, GameState::PRE_GAME, GameState::GAME);
+
+        new GameStateCountdown($arena, $gameStateComponent, 30, GameState::GAME, GameState::POST_GAME);
+
+        new GameStateCountdown($arena, $gameStateComponent, 10, GameState::POST_GAME, GameState::RESTARTING);
+    }
+}
\ No newline at end of file