Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Pocket/plugins/Mineplex/src/Test.php

@@ -7,17 +7,9 @@
  */
 
 
-function myfunction($a,$b)
+$a1 = array();
-{
+$a2 = array($a1);
-    if ($a===$b)
-    {
-        return 0;
-    }
-    return ($a>$b)?1:-1;
-}
 
-$a1=array(new stdClass(),"b"=>"green","c"=>"blue");
+array_push($a1, $a2);
-$a2=array("a"=>"blue","b"=>"black","e"=>"blue");
 
-$result=array_udiff($a1,$a2,"myfunction");
+print_r($a1);
-print_r($result);

Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/MultiGameArena.php

@@ -83,7 +83,6 @@ class MultiGameArena implements Arena, Listener
         Server::getInstance()->getPluginManager()->callEvent(new ArenaStartEvent($this));
     }
 
-
     public function getPlayers()
     {
         return $this->players;

Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/feature/features/NoPickUpItem.php

@@ -48,7 +48,7 @@ class NoPickUpItem extends ListenerFeature {
             Server::getInstance()->broadcastMessage("Stopped!");
         } else
             Server::getInstance()->broadcastMessage("Not Stopped!");
-        
+
 
     }
 

Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/feature/managers/GameStateFeatureManager.php

@@ -26,11 +26,11 @@ class GameStateFeatureManager implements Listener {
     private $arena;
 
     /** @var Feature[][] */
-    private $features;
+    private $features = [];
 
     /**
      * @param Arena $arena
-     * @param Feature[][] $features
+     * @param Feature[] $features
      */
     public function __construct(Arena $arena, array $features)
     {
@@ -38,7 +38,10 @@ class GameStateFeatureManager implements Listener {
 
         unset ($features[GameState::RESTARTING]);
 
-        $this->features = $features;
+        foreach ($features as $key => $value)
+        {
+            $this->features[$key] = UtilArray::getValuesRecursively($value);
+        }
 
         Server::getInstance()->getPluginManager()->registerEvents($this, $arena->getPlugin());
     }

Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/sg/SurvivalGames.php

@@ -36,17 +36,13 @@ class SurvivalGames implements Game {
 
         //Init features
 
-        $noBlockBreak = new NoBlockBreak($arena, [Item::GRASS]);
-
-        $noBlockPlace = new NoBlockPlace($arena, [Item::WOOD], true);
-
-        $noDropItem = new NoDropItem($arena, [Item::APPLE], true);
-
         $noPickUpItem = new NoPickUpItem($arena, [Item::GRASS], true);
 
+        $pack = array(new NoBlockBreak($arena, [Item::GRASS]), new NoBlockPlace($arena, [Item::WOOD], true),new NoDropItem($arena, [Item::APPLE], true));
+
         /** @var Feature[][] $features */
         $features = array(
-            GameState::LOBBY => array($noBlockBreak, $noBlockPlace, $noDropItem, $noPickUpItem)
+            GameState::LOBBY => array($noPickUpItem, $pack)
         );
 
 

Pocket/plugins/Mineplex/src/mineplex/plugin/util/UtilArray.php

@@ -30,4 +30,25 @@ class UtilArray {
         }
         return ($a>$b)?1:-1;
     }
+
+    public static function getValuesRecursively($object)
+    {
+        if (!is_array($object))
+            return [$object];
+
+        $returnArray = [];
+        foreach ($object as $value)
+        {
+            if (is_array($value))
+            {
+                $returnArray = array_merge($returnArray, array_values(self::getValuesRecursively($value)));
+            }
+            else
+            {
+                array_push($returnArray, $value);
+            }
+        }
+        return $returnArray;
+    }
+
 }