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

Moo

Browse Source 
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
This commit is contained in:
Aaron Brock 2015-07-06 22:22:14 -04:00
parent b89cc7818c
commit 547d496853
6 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Pocket/plugins/Mineplex/src/Test.php
View File

@ -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);

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

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

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

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

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

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

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

@ -36,17 +36,13 @@ class SurvivalGames implements Game {
//Init features //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); $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 */ /** @var Feature[][] $features */
$features = array( $features = array(
GameState::LOBBY => array($noBlockBreak, $noBlockPlace, $noDropItem, $noPickUpItem) GameState::LOBBY => array($noPickUpItem, $pack)
); );

21
Pocket/plugins/Mineplex/src/mineplex/plugin/util/UtilArray.php
View File

@ -30,4 +30,25 @@ class UtilArray {
} }
return ($a>$b)?1:-1; 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;
}
} }