diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Perk.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Perk.java index 5b8af51b1..aecdbf572 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Perk.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Perk.java @@ -54,4 +54,9 @@ public abstract class Perk implements Listener { //Null Default } + + public void registeredEvents() + { + // When listener has been registered + } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java index 561ebbb7f..119179fb8 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java @@ -307,7 +307,7 @@ public class GameManager implements Listener event.GetGame().RegisterKits(); } - @EventHandler + @EventHandler(priority = EventPriority.HIGH) public void KitDeregister(GameStateChangeEvent event) { if (event.GetState() != GameState.Dead) diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/world/WorldComponent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/world/WorldComponent.php index e1d69501b..84d3caba1 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/world/WorldComponent.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/world/WorldComponent.php @@ -11,6 +11,7 @@ namespace mineplex\plugin\gameengine\game\components\world; use mineplex\plugin\gameengine\arenas\Arena; use mineplex\plugin\gameengine\game\components\world\event\WorldLoadFailEvent; use mineplex\plugin\gameengine\game\components\world\event\WorldLoadSuccessEvent; +use mineplex\plugin\util\UtilArray; use mineplex\plugin\util\UtilString; use pocketmine\event\Listener; use pocketmine\level\Position; @@ -231,27 +232,35 @@ class WorldComponent implements Listener } } + /** + * @return Position[][] + */ public function getTeams() { return $this->mapTeams; } + /** + * @param $key + * @return int + */ public function getSetting($key) { return $this->mapSettings[$key]; } + /** + * @param $key + * @return Position[] + */ public function getData($key) { - return $this->mapData[$key]; - } + if (UtilArray::hasKey($key, $this->mapData)) + return $this->mapData[$key]; - public function getPosition() - { - return $this->getTeams()[0][0]; + return []; } - protected function strToPos($str) { if (strlen($str) < 5)