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

Made some changes for 0.12

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-06-26 13:49:38 -07:00
committed by Shoghi Cervantes
parent 0380e9009a
commit 4258e22c02
18 changed files with 227 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/pocketmine/network/Network.php
View File

@ -74,6 +74,7 @@ use pocketmine\network\protocol\UpdateBlockPacket;
use pocketmine\network\protocol\UseItemPacket;
use pocketmine\Player;
use pocketmine\Server;
use pocketmine\utils\Binary;
use pocketmine\utils\MainLogger;
class Network{
@ -219,14 +220,22 @@ class Network{
$offset = 0;
try{
while($offset < $len){
if(($pk = $this->getPacket(ord($str{$offset++}))) !== null){
$pkLen = Binary::readInt(substr($str, $offset, 4));
$offset += 4;
$buf = substr($str, $offset, $pkLen);
$offset += $pkLen;
if(($pk = $this->getPacket(ord($buf{0}))) !== null){
if($pk::NETWORK_ID === Info::BATCH_PACKET){
throw new \InvalidStateException("Invalid BatchPacket inside BatchPacket");
}
$pk->setBuffer($str, $offset);
$pk->setBuffer($buf, 1);
$pk->decode();
$p->handleDataPacket($pk);
$offset += $pk->getOffset();
if($pk->getOffset() <= 0){
return;
}

33
src/pocketmine/network/protocol/DataPacket.php
View File

@ -163,20 +163,45 @@ abstract class DataPacket extends \stdClass{
}
protected function getSlot(){
$id = $this->getShort();
$id = $this->getShort(false);
if($id == 0xffff){
return Item::get(0, 0, 0);
}
$cnt = $this->getByte();
$data = $this->getShort();
$nbtLen = $this->getShort();
$nbt = "";
if($nbtLen > 0){
$nbt = $this->get($nbtLen);
}
return Item::get(
$id,
$this->getShort(),
$cnt
$data,
$cnt,
$nbt
);
}
protected function putSlot(Item $item){
if($item->getId() === 0){
$this->putShort(0xffff);
return;
}
$this->putShort($item->getId());
$this->putByte($item->getCount());
$this->putShort($item->getDamage());
$nbt = $item->getCompoundTag();
$this->putShort(strlen($nbt));
$this->put($nbt);
}
protected function getString(){
@ -198,4 +223,4 @@ abstract class DataPacket extends \stdClass{
$this->offset = 0;
return $this;
}
}
}

7
src/pocketmine/network/protocol/FullChunkDataPacket.php
View File

@ -26,9 +26,13 @@ namespace pocketmine\network\protocol;
class FullChunkDataPacket extends DataPacket{
const NETWORK_ID = Info::FULL_CHUNK_DATA_PACKET;
const ORDER_COLUMNS = 0;
const ORDER_LAYERED = 1;
public $chunkX;
public $chunkZ;
public $order = self::ORDER_COLUMNS;
public $data;
public function decode(){
@ -39,8 +43,9 @@ class FullChunkDataPacket extends DataPacket{
$this->reset();
$this->putInt($this->chunkX);
$this->putInt($this->chunkZ);
$this->putByte($this->order);
$this->putInt(strlen($this->data));
$this->put($this->data);
}
}
}

113
src/pocketmine/network/protocol/Info.php
View File

@ -30,66 +30,63 @@ interface Info{
/**
* Actual Minecraft: PE protocol version
*/
const CURRENT_PROTOCOL = 27;
const CURRENT_PROTOCOL = 28;
const LOGIN_PACKET = 0x82;
const PLAY_STATUS_PACKET = 0x83;
const DISCONNECT_PACKET = 0x84;
const TEXT_PACKET = 0x85;
const SET_TIME_PACKET = 0x86;
const START_GAME_PACKET = 0x87;
const ADD_PLAYER_PACKET = 0x88;
const REMOVE_PLAYER_PACKET = 0x89;
const ADD_ENTITY_PACKET = 0x8a;
const REMOVE_ENTITY_PACKET = 0x8b;
const ADD_ITEM_ENTITY_PACKET = 0x8c;
const TAKE_ITEM_ENTITY_PACKET = 0x8d;
const MOVE_ENTITY_PACKET = 0x8e;
const MOVE_PLAYER_PACKET = 0x8f;
const REMOVE_BLOCK_PACKET = 0x90;
const UPDATE_BLOCK_PACKET = 0x91;
const ADD_PAINTING_PACKET = 0x92;
const EXPLODE_PACKET = 0x93;
const LEVEL_EVENT_PACKET = 0x94;
const TILE_EVENT_PACKET = 0x95;
const ENTITY_EVENT_PACKET = 0x96;
const MOB_EFFECT_PACKET = 0x97;
const PLAYER_EQUIPMENT_PACKET = 0x98;
const PLAYER_ARMOR_EQUIPMENT_PACKET = 0x99;
const INTERACT_PACKET = 0x9a;
const USE_ITEM_PACKET = 0x9b;
const PLAYER_ACTION_PACKET = 0x9c;
const HURT_ARMOR_PACKET = 0x9d;
const SET_ENTITY_DATA_PACKET = 0x9e;
const SET_ENTITY_MOTION_PACKET = 0x9f;
const SET_ENTITY_LINK_PACKET = 0xa0;
const SET_HEALTH_PACKET = 0xa1;
const SET_SPAWN_POSITION_PACKET = 0xa2;
const ANIMATE_PACKET = 0xa3;
const RESPAWN_PACKET = 0xa4;
const DROP_ITEM_PACKET = 0xa5;
const CONTAINER_OPEN_PACKET = 0xa6;
const CONTAINER_CLOSE_PACKET = 0xa7;
const CONTAINER_SET_SLOT_PACKET = 0xa8;
const CONTAINER_SET_DATA_PACKET = 0xa9;
const CONTAINER_SET_CONTENT_PACKET = 0xaa;
//const CONTAINER_ACK_PACKET = 0xab;
const ADVENTURE_SETTINGS_PACKET = 0xac;
const TILE_ENTITY_DATA_PACKET = 0xad;
//const PLAYER_INPUT_PACKET = 0xae;
const FULL_CHUNK_DATA_PACKET = 0xaf;
const SET_DIFFICULTY_PACKET = 0xb0;
const BATCH_PACKET = 0xb1;
const DISCONNECT_PACKET = 0x84;
const BATCH_PACKET = 0x85;
const TEXT_PACKET = 0x86;
const SET_TIME_PACKET = 0x87;
const START_GAME_PACKET = 0x88;
const ADD_PLAYER_PACKET = 0x89;
const REMOVE_PLAYER_PACKET = 0x8a;
const ADD_ENTITY_PACKET = 0x8b;
const REMOVE_ENTITY_PACKET = 0x8c;
const ADD_ITEM_ENTITY_PACKET = 0x8d;
const TAKE_ITEM_ENTITY_PACKET = 0x8e;
const MOVE_ENTITY_PACKET = 0x8f;
const MOVE_PLAYER_PACKET = 0x90;
const REMOVE_BLOCK_PACKET = 0x91;
const UPDATE_BLOCK_PACKET = 0x92;
const ADD_PAINTING_PACKET = 0x93;
const EXPLODE_PACKET = 0x94;
const LEVEL_EVENT_PACKET = 0x95;
const TILE_EVENT_PACKET = 0x96;
const ENTITY_EVENT_PACKET = 0x97;
const MOB_EFFECT_PACKET = 0x98;
const UPDATE_ATTRIBUTES_PACKET = 0x99;
const PLAYER_EQUIPMENT_PACKET = 0x9a;
const PLAYER_ARMOR_EQUIPMENT_PACKET = 0x9b;
const INTERACT_PACKET = 0x9c;
const USE_ITEM_PACKET = 0x9d;
const PLAYER_ACTION_PACKET = 0x9e;
const HURT_ARMOR_PACKET = 0x9f;
const SET_ENTITY_DATA_PACKET = 0xa0;
const SET_ENTITY_MOTION_PACKET = 0xa1;
const SET_ENTITY_LINK_PACKET = 0xa2;
const SET_HEALTH_PACKET = 0xa3;
const SET_SPAWN_POSITION_PACKET = 0xa4;
const ANIMATE_PACKET = 0xa5;
const RESPAWN_PACKET = 0xa6;
const DROP_ITEM_PACKET = 0xa7;
const CONTAINER_OPEN_PACKET = 0xa8;
const CONTAINER_CLOSE_PACKET = 0xa9;
const CONTAINER_SET_SLOT_PACKET = 0xaa;
const CONTAINER_SET_DATA_PACKET = 0xab;
const CONTAINER_SET_CONTENT_PACKET = 0xac;
const ADVENTURE_SETTINGS_PACKET = 0xad;
const TILE_ENTITY_DATA_PACKET = 0xae;
//const PLAYER_INPUT_PACKET = 0xaf;
const FULL_CHUNK_DATA_PACKET = 0xb0;
const SET_DIFFICULTY_PACKET = 0xb1;
//const CHANGE_DIMENSION_PACKET = 0xb2;
//const SET_PLAYER_GAMETYPE_PACKET = 0xb3;
//const PLAYER_LIST_PACKET = 0xb4;
}

4
src/pocketmine/network/protocol/LoginPacket.php
View File

@ -39,11 +39,11 @@ class LoginPacket extends DataPacket{
$this->username = $this->getString();
$this->protocol1 = $this->getInt();
$this->protocol2 = $this->getInt();
$this->clientId = $this->getInt();
if($this->protocol1 < 21){ //New fields!
if($this->protocol1 < 22){ //New fields!
$this->setBuffer(null, 0); //Skip batch packet handling
return;
}
$this->clientId = $this->getLong();
$this->slim = $this->getByte() > 0;
$this->skin = $this->getString();
}

6
src/pocketmine/network/protocol/SetSpawnPositionPacket.php
View File

@ -28,8 +28,8 @@ class SetSpawnPositionPacket extends DataPacket{
const NETWORK_ID = Info::SET_SPAWN_POSITION_PACKET;
public $x;
public $z;
public $y;
public $z;
public function decode(){
@ -38,8 +38,8 @@ class SetSpawnPositionPacket extends DataPacket{
public function encode(){
$this->reset();
$this->putInt($this->x);
$this->putInt($this->y);
$this->putInt($this->z);
$this->putByte($this->y);
}
}
}

4
src/pocketmine/network/protocol/SetTimePacket.php
View File

@ -39,7 +39,7 @@ class SetTimePacket extends DataPacket{
public function encode(){
$this->reset();
$this->putInt((int) (($this->time / Level::TIME_FULL) * 19200));
$this->putByte($this->started == true ? 0x80 : 0x00);
$this->putByte($this->started ? 1 : 0);
}
}
}

2
src/pocketmine/network/protocol/StartGamePacket.php
View File

@ -28,6 +28,7 @@ class StartGamePacket extends DataPacket{
const NETWORK_ID = Info::START_GAME_PACKET;
public $seed;
public $dimension;
public $generator;
public $gamemode;
public $eid;
@ -45,6 +46,7 @@ class StartGamePacket extends DataPacket{
public function encode(){
$this->reset();
$this->putInt($this->seed);
$this->putByte($this->dimension);
$this->putInt($this->generator);
$this->putInt($this->gamemode);
$this->putLong($this->eid);

4
src/pocketmine/network/protocol/TileEntityDataPacket.php
View File

@ -34,7 +34,7 @@ class TileEntityDataPacket extends DataPacket{
public function decode(){
$this->x = $this->getInt();
$this->y = $this->getByte();
$this->y = $this->getInt();
$this->z = $this->getInt();
$this->namedtag = $this->get(true);
}
@ -42,7 +42,7 @@ class TileEntityDataPacket extends DataPacket{
public function encode(){
$this->reset();
$this->putInt($this->x);
$this->putByte($this->y);
$this->putInt($this->y);
$this->putInt($this->z);
$this->put($this->namedtag);
}

7
src/pocketmine/network/protocol/UseItemPacket.php
View File

@ -32,8 +32,6 @@ class UseItemPacket extends DataPacket{
public $z;
public $face;
public $item;
public $meta;
public $eid;
public $fx;
public $fy;
public $fz;
@ -46,15 +44,14 @@ class UseItemPacket extends DataPacket{
$this->y = $this->getInt();
$this->z = $this->getInt();
$this->face = $this->getByte();
$this->item = $this->getShort();
$this->meta = $this->getShort();
$this->eid = $this->getLong();
$this->fx = $this->getFloat();
$this->fy = $this->getFloat();
$this->fz = $this->getFloat();
$this->posX = $this->getFloat();
$this->posY = $this->getFloat();
$this->posZ = $this->getFloat();
$this->item = $this->getSlot();
}
public function encode(){