Update to PocketMine-MP 3.0.0-ALPHA7

GiantQuartz · Aug 10, 2017 · bfdd2e3 · bfdd2e3
1 parent f301c8f
commit bfdd2e3
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 19 deletions.
diff --git a/plugin.yml b/plugin.yml
@@ -12,5 +12,5 @@ name: SkyBlock
 author: GiantQuartz
 website: http://twitter.com/GiantQuartz
 main: SkyBlock\Main
-version: "0.1.7"
-api: [2.0.0]
+version: "0.1.8"
+api: [3.0.0-ALPHA7]
diff --git a/src/SkyBlock/EventListener.php b/src/SkyBlock/EventListener.php
@@ -185,7 +185,7 @@ public function onHurt(EntityDamageEvent $event) {
      */
     public function onUnloadLevel(LevelUnloadEvent $event) {
         foreach($event->getLevel()->getPlayers() as $player) {
-            $player->teleportImmediate($this->plugin->getServer()->getDefaultLevel()->getSafeSpawn());
+            $player->teleport($this->plugin->getServer()->getDefaultLevel()->getSafeSpawn());
         }
     }
 

diff --git a/src/SkyBlock/Main.php b/src/SkyBlock/Main.php
@@ -186,7 +186,7 @@ public function setResetHandler() {
      * Register ChatHandler instance
      */
     public function setChatHandler() {
-        $this->chatHandler = new ChatHandler($this);
+        $this->chatHandler = new ChatHandler();
     }
 
     /**

diff --git a/src/SkyBlock/PluginHearbeat.php b/src/SkyBlock/PluginHearbeat.php
@@ -18,7 +18,7 @@ public function __construct(Main $owner) {
         parent::__construct($owner);
     }
 
-    public function onRun($currentTick) {
+    public function onRun(int $currentTick) {
         $this->nextUpdate++;
         /** @var Main $owner */
         $owner = $this->getOwner();

diff --git a/src/SkyBlock/command/SkyBlockCommand.php b/src/SkyBlock/command/SkyBlockCommand.php
@@ -33,7 +33,7 @@ public function sendMessage(Player $sender, $message) {
         $sender->sendMessage(TextFormat::GREEN . "- " . TextFormat::WHITE . $message);
     }
 
-    public function execute(CommandSender $sender, $commandLabel, array $args) {
+    public function execute(CommandSender $sender, string $commandLabel, array $args) {
         if($sender instanceof Player) {
             if(isset($args[0])) {
                 switch($args[0]) {
@@ -238,7 +238,7 @@ public function execute(CommandSender $sender, $commandLabel, array $args) {
                                 if($player instanceof Player and $player->isOnline()) {
                                     $invitation = $this->plugin->getInvitationHandler()->getInvitation($player);
                                     if($invitation instanceof Invitation) {
-                                        if($invitation->getSender() == $player) {
+                                        if($invitation->getSender() === $player) {
                                             $invitation->accept();
                                         }
                                         else {
@@ -270,7 +270,7 @@ public function execute(CommandSender $sender, $commandLabel, array $args) {
                                 if($player instanceof Player and $player->isOnline()) {
                                     $invitation = $this->plugin->getInvitationHandler()->getInvitation($player);
                                     if($invitation instanceof Invitation) {
-                                        if($invitation->getSender() == $player) {
+                                        if($invitation->getSender() === $player) {
                                             $invitation->deny();
                                         }
                                         else {
@@ -354,7 +354,7 @@ public function execute(CommandSender $sender, $commandLabel, array $args) {
                                         if($player instanceof Player and $player->isOnline()) {
                                             $playerConfig = $this->plugin->getSkyBlockManager()->getPlayerConfig($player);
                                             $playerIsland = $this->plugin->getIslandManager()->getOnlineIsland($playerConfig->get("island"));
-                                            if($island == $playerIsland) {
+                                            if($island === $playerIsland) {
                                                 $island->setOwnerName($player);
                                                 $island->addPlayer($player);
                                                 $this->sendMessage($sender, "You sent the ownership to {$player->getName()}");

diff --git a/src/SkyBlock/generator/generators/BasicIsland.php b/src/SkyBlock/generator/generators/BasicIsland.php
@@ -50,15 +50,15 @@ public function init(ChunkManager $level, Random $random) {
      *
      * @return string
      */
-    public function getName() {
+    public function getName() : string {
         return $this->name;
     }
 
-    public function getSettings() {
+    public function getSettings() : array {
         return $this->settings;
     }
 
-    public function generateChunk($chunkX, $chunkZ) {
+    public function generateChunk(int $chunkX, int $chunkZ) {
         $chunk = $this->level->getChunk($chunkX, $chunkZ);
         $chunk->setGenerated();
         if ($chunkX % 20 == 0 && $chunkZ % 20 == 0) {
@@ -79,20 +79,21 @@ public function generateChunk($chunkX, $chunkZ) {
         }
     }
 
-    public function populateChunk($chunkX, $chunkZ) {
-        for ($x = 0; $x < 16; $x++) {
+    public function populateChunk(int $chunkX, int $chunkZ) {
+        // this disappeared in API 3.0.0-ALPHA1 due to client changes (client doesn't support custom biome colours anymore)
+        /*for ($x = 0; $x < 16; $x++) {
             for ($z = 0; $z < 16; $z++) {
                 $this->level->getChunk($chunkX, $chunkZ)->setBiomeColor($x, $z, 133, 188, 86);
             }
-        }
+        }*/
     }
 
     /**
      * Return BasicIsland spawn
      *
      * @return Vector3
      */
-    public function getSpawn() {
+    public function getSpawn() : Vector3 {
         return new Vector3(8, 7, 10);
     }
 

diff --git a/src/SkyBlock/skyblock/SkyBlockManager.php b/src/SkyBlock/skyblock/SkyBlockManager.php
@@ -6,6 +6,7 @@
 use pocketmine\item\Item;
 use pocketmine\level\generator\Generator;
 use pocketmine\math\Vector3;
+use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\IntTag;
 use pocketmine\nbt\tag\ListTag;
@@ -43,15 +44,17 @@ public function spawnDefaultChest($islandName) {
         $level = $this->plugin->getServer()->getLevelByName($islandName);
         $level->setBlock(new Vector3(10, 6, 4), new Block(0, 0));
         $level->loadChunk(10, 4, true);
+        $level->setBlock(new Vector3(10, 6, 4), new Block(54, 0));
         /** @var Chest $chest */
-        $chest = Tile::createTile("Chest",$level->getChunk(10 >> 4, 4 >> 4), new CompoundTag(" ", [
+        $nbt = new CompoundTag(" ", [
             new ListTag("Items", []),
             new StringTag("id", Tile::CHEST),
             new IntTag("x", 10),
             new IntTag("y", 6),
             new IntTag("z", 4)
-        ]));
-        $level->setBlock(new Vector3(10, 6, 4), new Block(54, 0));
+        ]);
+        $nbt->Items->setTagType(NBT::TAG_Compound);
+        $chest = Tile::createTile("Chest", $level, $nbt);
         $level->addTile($chest);
         $inventory = $chest->getInventory();
         $inventory->addItem(Item::get(Item::WATER, 0, 2));