Preparing to merge

This commit is contained in:
Shoghi Cervantes
2014-06-05 01:22:04 +02:00
parent 596f4ddb0e
commit 2674902eaa
11 changed files with 15 additions and 56 deletions

View File

@ -81,12 +81,10 @@ use pocketmine\scheduler\CallbackTask;
use pocketmine\tile\Sign;
use pocketmine\tile\Spawnable;
use pocketmine\tile\Tile;
use pocketmine\utils\Binary;
use pocketmine\utils\TextFormat;
/**
* Main class that handles networking, recovery, and packet sending to the server part
* TODO: Move reliability layer
*/
class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
@ -729,19 +727,6 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
}
}
break;
case "tile.container.slot":
if($data["tile"]->getLevel() === $this->getLevel()){
foreach($this->windows as $id => $w){
if($w === $data["tile"]){
$pk = new ContainerSetSlotPacket;
$pk->windowid = $id;
$pk->slot = $data["slot"] + (isset($data["offset"]) ? $data["offset"] : 0);
$pk->item = $data["slotdata"];
$this->dataPacket($pk);
}
}
}
break;
case "entity.metadata":
if($data->getID() === $this->id){
$eid = 0;
@ -755,19 +740,6 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$this->dataPacket($pk);
}
break;
case "entity.event":
if($data["entity"]->getID() === $this->id){
$eid = 0;
}else{
$eid = $data["entity"]->getID();
}
if($data["entity"]->getLevel() === $this->getLevel()){
$pk = new EntityEventPacket;
$pk->eid = $eid;
$pk->event = $data["event"];
$this->dataPacket($pk);
}
break;
}
}*/