mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-13 15:05:33 +00:00
Code Issues Projects Releases Wiki Activity

#303 Torches are able to be placed on top of Fences [gh#303]

Browse Source
This commit is contained in:
Shoghi Cervantes 2013-05-29 11:53:14 +02:00
parent fde93debb4
commit 4a969257d1
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/API/ServerAPI.php
View File

@ -117,7 +117,6 @@ class ServerAPI{
console("[NOTICE] \x1b[33mVersion \"".$info["development"]["version"]."\" [".substr($info["development"]["commit"], 0, 10)."]"); console("[NOTICE] \x1b[33mVersion \"".$info["development"]["version"]."\" [".substr($info["development"]["commit"], 0, 10)."]");
console("[NOTICE] \x1b[36mGet it at PocketMine.net or ".$info["development"]["download"]); console("[NOTICE] \x1b[36mGet it at PocketMine.net or ".$info["development"]["download"]);
console("[NOTICE] This message will dissapear after issuing the command \"/update-done\""); console("[NOTICE] This message will dissapear after issuing the command \"/update-done\"");
sleep(3);
}else{ }else{
$this->setProperty("last-update", time()); $this->setProperty("last-update", time());
console("[INFO] \x1b[36mThis is the latest DEVELOPMENT version"); console("[INFO] \x1b[36mThis is the latest DEVELOPMENT version");
@ -136,7 +135,6 @@ class ServerAPI{
console("[NOTICE] \x1b[36mVersion \"".$info["stable"]["version"]."\" #".$updateN); console("[NOTICE] \x1b[36mVersion \"".$info["stable"]["version"]."\" #".$updateN);
console("[NOTICE] Get it at PocketMine.net or ".$info["stable"]["download"]); console("[NOTICE] Get it at PocketMine.net or ".$info["stable"]["download"]);
console("[NOTICE] This message will dissapear as soon as you update"); console("[NOTICE] This message will dissapear as soon as you update");
sleep(5);
}else{ }else{
$this->setProperty("last-update", time()); $this->setProperty("last-update", time());
console("[INFO] \x1b[36mThis is the latest STABLE version"); console("[INFO] \x1b[36mThis is the latest STABLE version");

4
src/material/block/attachable/Torch.php
View File

@ -43,7 +43,7 @@ class TorchBlock extends FlowableBlock{
0 => 0, 0 => 0,
); );
if($this->getSide($faces[$side])->isTransparent === true){ //Replace wit hcommon break method if($this->getSide($faces[$side])->isFlowable === true){ //Replace wit common break method
ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem($this->id)); ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem($this->id));
$this->level->setBlock($this, new AirBlock(), false); $this->level->setBlock($this, new AirBlock(), false);
return BLOCK_UPDATE_NORMAL; return BLOCK_UPDATE_NORMAL;
@ -64,7 +64,7 @@ class TorchBlock extends FlowableBlock{
$this->meta = $faces[$face]; $this->meta = $faces[$face];
$this->level->setBlock($block, $this); $this->level->setBlock($block, $this);
return true; return true;
}elseif($this->getSide(0)->isTransparent === false){ }elseif($this->getSide(0)->isTransparent === false or $this->getSide(0)->getID() === FENCE){
$this->meta = 0; $this->meta = 0;
$this->level->setBlock($block, $this); $this->level->setBlock($block, $this);
return true; return true;