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

Removed code remove comments

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-03-06 13:05:54 +01:00
parent a14deae634
commit bbd66e6ad1
8 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/block/Lava.php
View File

@ -81,7 +81,7 @@ class LavaBlock extends LiquidBlock{
return false; return false;
} }
if( $this->checkWater()){ if($this->checkWater()){
return; return;
} }

1
src/block/SnowLayer.php
View File

@ -53,5 +53,6 @@ class SnowLayerBlock extends FlowableBlock{
array(SNOWBALL, 0, 1), array(SNOWBALL, 0, 1),
); );
} }
return array();
} }
} }

27
src/block/Trapdoor.php
View File

@ -31,20 +31,21 @@ class TrapdoorBlock extends TransparentBlock{
$this->hardness = 15; $this->hardness = 15;
} }
public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ 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){ if(($target->isTransparent === false or $target->getID() === SLAB) and $face !== 0 and $face !== 1){
$faces = array( $faces = array(
2 => 0, 2 => 0,
3 => 1, 3 => 1,
4 => 2, 4 => 2,
5 => 3, 5 => 3,
); );
$this->meta = $faces[$face] & 0x03; $this->meta = $faces[$face] & 0x03;
if($fy > 0.5){ if($fy > 0.5){
$this->meta |= 0x08; $this->meta |= 0x08;
}
$this->level->setBlock($block, $this, true, false, true);
return true;
} }
$this->level->setBlock($block, $this, true, false, true);
return true;
}
return false;
} }
public function getDrops(Item $item, Player $player){ public function getDrops(Item $item, Player $player){
return array( return array(

19
src/network/Handler.php
View File

@ -53,22 +53,22 @@ class Handler{
$pid = ord($buffer{0}); $pid = ord($buffer{0});
if(RakNetInfo::isValid($pid)){ if(RakNet\Info::isValid($pid)){
$packet = new RakNetPacket($pid); $packet = new RakNet\Packet($pid);
$packet->buffer =& $buffer; $packet->buffer =& $buffer;
$packet->ip = $source; $packet->ip = $source;
$packet->port = $port; $packet->port = $port;
$packet->decode(); $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 false;
} }
return $packet; return $packet;
}elseif($pid === 0xfe and $buffer{1} === "\xfd" and ServerAPI::request()->api->query instanceof QueryHandler){ }elseif($pid === 0xfe and $buffer{1} === "\xfd" and ServerAPI::request()->api->query instanceof Query\QueryHandler){
$packet = new QueryPacket; $packet = new Query\QueryPacket;
$packet->ip = $source; $packet->ip = $source;
$packet->port = $port; $packet->port = $port;
$packet->buffer =& $buffer; $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; return false;
} }
ServerAPI::request()->api->query->handle($packet); ServerAPI::request()->api->query->handle($packet);
@ -77,15 +77,16 @@ class Handler{
$packet->ip = $source; $packet->ip = $source;
$packet->port = $port; $packet->port = $port;
$packet->buffer =& $buffer; $packet->buffer =& $buffer;
EventHandler::callEvent(new PacketReceiveEvent($packet)); Event\EventHandler::callEvent(new Event\Server\PacketReceiveEvent($packet));
return false; return false;
} }
return true;
} }
public function writePacket(Packet $packet){ 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; return 0;
}elseif($packet instanceof RakNetPacket){ }elseif($packet instanceof RakNet\Packet){
$packet->encode(); $packet->encode();
} }
$write = $this->socket->write($packet->buffer, $packet->ip, $packet->port); $write = $this->socket->write($packet->buffer, $packet->ip, $packet->port);

1
src/pmf/PMF.php
View File

@ -101,6 +101,7 @@ class PMF{
} }
$this->seek(0); $this->seek(0);
$this->write("PMF" . chr((int) $version) . chr((int) $type)); $this->write("PMF" . chr((int) $version) . chr((int) $type));
return true;
} }
public function read($length){ public function read($length){

1
src/pmf/Plugin.php
View File

@ -76,6 +76,7 @@ class Plugin extends PMF{
$this->pluginData["code"] .= $this->read(4096); $this->pluginData["code"] .= $this->read(4096);
} }
$this->pluginData["code"] = gzinflate($this->pluginData["code"]); $this->pluginData["code"] = gzinflate($this->pluginData["code"]);
return true;
} }
} }

2
src/tile/Chest.php
View File

@ -67,6 +67,7 @@ class Chest extends Spawnable{
$tile->spawnToAll(); $tile->spawnToAll();
$this->server->handle("tile.update", $this); $this->server->handle("tile.update", $this);
$this->server->handle("tile.update", $tile); $this->server->handle("tile.update", $tile);
return true;
} }
public function unpair(){ public function unpair(){
@ -83,6 +84,7 @@ class Chest extends Spawnable{
$tile->spawnToAll(); $tile->spawnToAll();
$this->server->handle("tile.update", $tile); $this->server->handle("tile.update", $tile);
} }
return true;
} }
public function spawnTo(Player $player){ public function spawnTo(Player $player){

1
src/tile/Sign.php
View File

@ -75,6 +75,7 @@ class Sign extends Spawnable{
$pk->z = $this->z; $pk->z = $this->z;
$pk->namedtag = $nbt->write(); $pk->namedtag = $nbt->write();
$player->dataPacket($pk); $player->dataPacket($pk);
return true;
} }
} }