mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 12:18:46 +00:00
Code Issues Projects Releases Wiki Activity

Changed @williamtdr syntax

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-07-30 16:05:36 +02:00
parent f5fee4c909
commit a9cd03da2e
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Player.php
View File

@ -1614,7 +1614,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
if( if(
$target instanceof Player and $target instanceof Player and
$this->server->getConfigBoolean("pvp",true) === false $this->server->getConfigBoolean("pvp", true) === false
){ ){
$cancelled = true; $cancelled = true;

1
src/pocketmine/block/Generic.php
View File

@ -59,7 +59,6 @@ class Generic extends Block{
"z" => $this->z + 0.5, "z" => $this->z + 0.5,
"Tile" => $this->id, "Tile" => $this->id,
); );
$server = Server::getInstance();
/*$this->getLevel()->setBlock($this, new Air(), false, false, true); /*$this->getLevel()->setBlock($this, new Air(), false, false, true);
//TODO //TODO
//$e = $server->api->entity->add($this->getLevel(), ENTITY_FALLING, FALLING_SAND, $data); //$e = $server->api->entity->add($this->getLevel(), ENTITY_FALLING, FALLING_SAND, $data);

6
src/pocketmine/level/Level.php
View File

@ -814,10 +814,10 @@ class Level implements ChunkManager, Metadatable{
$level = $target->getLevel(); $level = $target->getLevel();
if($level instanceof Level) { if($level instanceof Level){
$above = $level->getBlock(new Vector3($target->x, $target->y + 1, $target->z)); $above = $level->getBlock(new Vector3($target->x, $target->y + 1, $target->z));
if($above instanceof Block) { if($above instanceof Block){
if($above->getID() === Item::FIRE) { if($above->getID() === Item::FIRE){
$level->setBlock($above, new Air(), true, false, true); $level->setBlock($above, new Air(), true, false, true);
} }
} }