From a9cd03da2e3b2d0d94ac03e69773c113fa0b44e7 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Wed, 30 Jul 2014 16:05:36 +0200 Subject: [PATCH] Changed @williamtdr syntax --- src/pocketmine/Player.php | 2 +- src/pocketmine/block/Generic.php | 1 - src/pocketmine/level/Level.php | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 9d2a06393..c82c4f76d 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -1614,7 +1614,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{ if( $target instanceof Player and - $this->server->getConfigBoolean("pvp",true) === false + $this->server->getConfigBoolean("pvp", true) === false ){ $cancelled = true; diff --git a/src/pocketmine/block/Generic.php b/src/pocketmine/block/Generic.php index 53a4681d1..ed94c57d5 100644 --- a/src/pocketmine/block/Generic.php +++ b/src/pocketmine/block/Generic.php @@ -59,7 +59,6 @@ class Generic extends Block{ "z" => $this->z + 0.5, "Tile" => $this->id, ); - $server = Server::getInstance(); /*$this->getLevel()->setBlock($this, new Air(), false, false, true); //TODO //$e = $server->api->entity->add($this->getLevel(), ENTITY_FALLING, FALLING_SAND, $data); diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index 1bbcf47f6..3357914c8 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -814,10 +814,10 @@ class Level implements ChunkManager, Metadatable{ $level = $target->getLevel(); - if($level instanceof Level) { + if($level instanceof Level){ $above = $level->getBlock(new Vector3($target->x, $target->y + 1, $target->z)); - if($above instanceof Block) { - if($above->getID() === Item::FIRE) { + if($above instanceof Block){ + if($above->getID() === Item::FIRE){ $level->setBlock($above, new Air(), true, false, true); } }