diff --git a/src/block/Lava.php b/src/block/Lava.php index 674b30a76..2630e48c1 100644 --- a/src/block/Lava.php +++ b/src/block/Lava.php @@ -81,7 +81,7 @@ class LavaBlock extends LiquidBlock{ return false; } - if( $this->checkWater()){ + if($this->checkWater()){ return; } diff --git a/src/block/SnowLayer.php b/src/block/SnowLayer.php index 9ed07e008..91d951226 100644 --- a/src/block/SnowLayer.php +++ b/src/block/SnowLayer.php @@ -53,5 +53,6 @@ class SnowLayerBlock extends FlowableBlock{ array(SNOWBALL, 0, 1), ); } + return array(); } } \ No newline at end of file diff --git a/src/block/Trapdoor.php b/src/block/Trapdoor.php index 49fef6d00..a0dc98a92 100644 --- a/src/block/Trapdoor.php +++ b/src/block/Trapdoor.php @@ -31,20 +31,21 @@ class TrapdoorBlock extends TransparentBlock{ $this->hardness = 15; } public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ - if(($target->isTransparent === false or $target->getID() === SLAB) and $face !== 0 and $face !== 1){ - $faces = array( - 2 => 0, - 3 => 1, - 4 => 2, - 5 => 3, - ); - $this->meta = $faces[$face] & 0x03; - if($fy > 0.5){ - $this->meta |= 0x08; - } - $this->level->setBlock($block, $this, true, false, true); - return true; + if(($target->isTransparent === false or $target->getID() === SLAB) and $face !== 0 and $face !== 1){ + $faces = array( + 2 => 0, + 3 => 1, + 4 => 2, + 5 => 3, + ); + $this->meta = $faces[$face] & 0x03; + if($fy > 0.5){ + $this->meta |= 0x08; } + $this->level->setBlock($block, $this, true, false, true); + return true; + } + return false; } public function getDrops(Item $item, Player $player){ return array( diff --git a/src/network/Handler.php b/src/network/Handler.php index 0bda9b37a..721629564 100644 --- a/src/network/Handler.php +++ b/src/network/Handler.php @@ -53,22 +53,22 @@ class Handler{ $pid = ord($buffer{0}); - if(RakNetInfo::isValid($pid)){ - $packet = new RakNetPacket($pid); + if(RakNet\Info::isValid($pid)){ + $packet = new RakNet\Packet($pid); $packet->buffer =& $buffer; $packet->ip = $source; $packet->port = $port; $packet->decode(); - if(EventHandler::callEvent(new PacketReceiveEvent($packet)) === Event::DENY){ + if(Event\EventHandler::callEvent(new Event\Server\PacketReceiveEvent($packet)) === Event\Event::DENY){ return false; } return $packet; - }elseif($pid === 0xfe and $buffer{1} === "\xfd" and ServerAPI::request()->api->query instanceof QueryHandler){ - $packet = new QueryPacket; + }elseif($pid === 0xfe and $buffer{1} === "\xfd" and ServerAPI::request()->api->query instanceof Query\QueryHandler){ + $packet = new Query\QueryPacket; $packet->ip = $source; $packet->port = $port; $packet->buffer =& $buffer; - if(EventHandler::callEvent(new PacketReceiveEvent($packet)) === Event::DENY){ + if(Event\EventHandler::callEvent(new Event\Server\PacketReceiveEvent($packet)) === Event\Event::DENY){ return false; } ServerAPI::request()->api->query->handle($packet); @@ -77,15 +77,16 @@ class Handler{ $packet->ip = $source; $packet->port = $port; $packet->buffer =& $buffer; - EventHandler::callEvent(new PacketReceiveEvent($packet)); + Event\EventHandler::callEvent(new Event\Server\PacketReceiveEvent($packet)); return false; } + return true; } public function writePacket(Packet $packet){ - if(EventHandler::callEvent(new PacketSendEvent($packet)) === Event::DENY){ + if(Event\EventHandler::callEvent(new Event\Server\PacketSendEvent($packet)) === Event\Event::DENY){ return 0; - }elseif($packet instanceof RakNetPacket){ + }elseif($packet instanceof RakNet\Packet){ $packet->encode(); } $write = $this->socket->write($packet->buffer, $packet->ip, $packet->port); diff --git a/src/pmf/PMF.php b/src/pmf/PMF.php index 0870f92eb..1f465b320 100644 --- a/src/pmf/PMF.php +++ b/src/pmf/PMF.php @@ -101,6 +101,7 @@ class PMF{ } $this->seek(0); $this->write("PMF" . chr((int) $version) . chr((int) $type)); + return true; } public function read($length){ diff --git a/src/pmf/Plugin.php b/src/pmf/Plugin.php index 91642cf04..211b415f3 100644 --- a/src/pmf/Plugin.php +++ b/src/pmf/Plugin.php @@ -76,6 +76,7 @@ class Plugin extends PMF{ $this->pluginData["code"] .= $this->read(4096); } $this->pluginData["code"] = gzinflate($this->pluginData["code"]); + return true; } } \ No newline at end of file diff --git a/src/tile/Chest.php b/src/tile/Chest.php index 650567bb4..0657a8fd4 100644 --- a/src/tile/Chest.php +++ b/src/tile/Chest.php @@ -67,6 +67,7 @@ class Chest extends Spawnable{ $tile->spawnToAll(); $this->server->handle("tile.update", $this); $this->server->handle("tile.update", $tile); + return true; } public function unpair(){ @@ -83,6 +84,7 @@ class Chest extends Spawnable{ $tile->spawnToAll(); $this->server->handle("tile.update", $tile); } + return true; } public function spawnTo(Player $player){ diff --git a/src/tile/Sign.php b/src/tile/Sign.php index d63543ba4..f7ed781d0 100644 --- a/src/tile/Sign.php +++ b/src/tile/Sign.php @@ -75,6 +75,7 @@ class Sign extends Spawnable{ $pk->z = $this->z; $pk->namedtag = $nbt->write(); $player->dataPacket($pk); + return true; } }