From fadf1a5d403da944951a25032ec18931de1692b8 Mon Sep 17 00:00:00 2001 From: MCMrARM Date: Thu, 26 Jun 2014 21:12:03 +0200 Subject: [PATCH 1/2] Fixed PlayerMetadataStore --- src/pocketmine/metadata/PlayerMetadataStore.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pocketmine/metadata/PlayerMetadataStore.php b/src/pocketmine/metadata/PlayerMetadataStore.php index f02c2dcfe..5194c6a68 100644 --- a/src/pocketmine/metadata/PlayerMetadataStore.php +++ b/src/pocketmine/metadata/PlayerMetadataStore.php @@ -21,15 +21,15 @@ namespace pocketmine\metadata; -use pocketmine\OfflinePlayer; +use pocketmine\IPlayer; class PlayerMetadataStore extends MetadataStore{ public function disambiguate(Metadatable $player, $metadataKey){ - if(!($player instanceof OfflinePlayer)){ - throw new \InvalidArgumentException("Argument must be an OfflinePlayer instance"); + if(!($player instanceof IPlayer)){ + throw new \InvalidArgumentException("Argument must be an IPlayer instance"); } return strtolower($player->getName()) . ":" . $metadataKey; } -} \ No newline at end of file +} From 87308d1c51f4c1620eb35053640a7a120b6c3f5c Mon Sep 17 00:00:00 2001 From: Darunia18 Date: Fri, 27 Jun 2014 02:45:32 -0400 Subject: [PATCH 2/2] Update Explosion.php Fixed bugs on lines 75 and 141. --- src/pocketmine/level/Explosion.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/level/Explosion.php b/src/pocketmine/level/Explosion.php index 02d4081d7..e70cab8e1 100644 --- a/src/pocketmine/level/Explosion.php +++ b/src/pocketmine/level/Explosion.php @@ -72,7 +72,7 @@ class Explosion{ for($blastForce = $this->size * (mt_rand(700, 1300) / 1000); $blastForce > 0; $blastForce -= $this->stepLen * 0.75){ $vBlock = $pointer->floor(); - $blockID = $this->level->level->getBlockID($vBlock->x, $vBlock->y, $vBlock->z); + $blockID = $this->level->getBlockIdAt($vBlock->x, $vBlock->y, $vBlock->z); if($blockID > 0){ $block = Block::get($blockID, 0); @@ -138,7 +138,7 @@ class Explosion{ //$server->api->entity->drop(new Position($block->x + 0.5, $block->y, $block->z + 0.5, $this->level), Item::get($block->getID(), $this->level->level->getBlockDamage($block->x, $block->y, $block->z))); } } - $this->level->level->setBlockID($block->x, $block->y, $block->z, 0); + $this->level->setBlockIdAt($block->x, $block->y, $block->z, 0); $send[] = new Vector3($block->x - $source->x, $block->y - $source->y, $block->z - $source->z); } $pk = new ExplodePacket;