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

Removed network channels, bumped protocol

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-08-12 14:59:30 +02:00
parent 8889e687c9
commit 31ef7721b1
28 changed files with 166 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/inventory/BaseInventory.php
View File

@ -435,7 +435,7 @@ abstract class BaseInventory implements Inventory{
continue;
}
$pk->windowid = $id;
$player->dataPacket($pk->setChannel(Network::CHANNEL_WORLD_EVENTS));
$player->dataPacket($pk);
}
}
@ -458,7 +458,7 @@ abstract class BaseInventory implements Inventory{
continue;
}
$pk->windowid = $id;
$player->dataPacket($pk->setChannel(Network::CHANNEL_WORLD_EVENTS));
$player->dataPacket($pk);
}
}

4
src/pocketmine/inventory/ChestInventory.php
View File

@ -51,7 +51,7 @@ class ChestInventory extends ContainerInventory{
$pk->case1 = 1;
$pk->case2 = 2;
if(($level = $this->getHolder()->getLevel()) instanceof Level){
$level->addChunkPacket($this->getHolder()->getX() >> 4, $this->getHolder()->getZ() >> 4, $pk->setChannel(Network::CHANNEL_WORLD_EVENTS));
$level->addChunkPacket($this->getHolder()->getX() >> 4, $this->getHolder()->getZ() >> 4, $pk);
}
}
}
@ -65,7 +65,7 @@ class ChestInventory extends ContainerInventory{
$pk->case1 = 1;
$pk->case2 = 0;
if(($level = $this->getHolder()->getLevel()) instanceof Level){
$level->addChunkPacket($this->getHolder()->getX() >> 4, $this->getHolder()->getZ() >> 4, $pk->setChannel(Network::CHANNEL_WORLD_EVENTS));
$level->addChunkPacket($this->getHolder()->getX() >> 4, $this->getHolder()->getZ() >> 4, $pk);
}
}
parent::onClose($who);

4
src/pocketmine/inventory/ContainerInventory.php
View File

@ -43,7 +43,7 @@ abstract class ContainerInventory extends BaseInventory{
$pk->x = $pk->y = $pk->z = 0;
}
$who->dataPacket($pk->setChannel(Network::CHANNEL_WORLD_EVENTS));
$who->dataPacket($pk);
$this->sendContents($who);
}
@ -51,7 +51,7 @@ abstract class ContainerInventory extends BaseInventory{
public function onClose(Player $who){
$pk = new ContainerClosePacket();
$pk->windowid = $who->getWindowId($this);
$who->dataPacket($pk->setChannel(Network::CHANNEL_WORLD_EVENTS));
$who->dataPacket($pk);
parent::onClose($who);
}
}

4
src/pocketmine/inventory/DoubleChestInventory.php
View File

@ -106,7 +106,7 @@ class DoubleChestInventory extends ChestInventory implements InventoryHolder{
$pk->case1 = 1;
$pk->case2 = 2;
if(($level = $this->right->getHolder()->getLevel()) instanceof Level){
$level->addChunkPacket($this->right->getHolder()->getX() >> 4, $this->right->getHolder()->getZ() >> 4, $pk->setChannel(Network::CHANNEL_WORLD_EVENTS));
$level->addChunkPacket($this->right->getHolder()->getX() >> 4, $this->right->getHolder()->getZ() >> 4, $pk);
}
}
}
@ -120,7 +120,7 @@ class DoubleChestInventory extends ChestInventory implements InventoryHolder{
$pk->case1 = 1;
$pk->case2 = 0;
if(($level = $this->right->getHolder()->getLevel()) instanceof Level){
$level->addChunkPacket($this->right->getHolder()->getX() >> 4, $this->right->getHolder()->getZ() >> 4, $pk->setChannel(Network::CHANNEL_WORLD_EVENTS));
$level->addChunkPacket($this->right->getHolder()->getX() >> 4, $this->right->getHolder()->getZ() >> 4, $pk);
}
}
parent::onClose($who);

12
src/pocketmine/inventory/PlayerInventory.php
View File

@ -133,12 +133,12 @@ class PlayerInventory extends BaseInventory{
$pk->selectedSlot = $this->getHeldItemIndex();
if(!is_array($target)){
$target->dataPacket($pk->setChannel(Network::CHANNEL_ENTITY_SPAWNING));
$target->dataPacket($pk);
if($target === $this->getHolder()){
$this->sendSlot($this->getHeldItemSlot(), $target);
}
}else{
Server::broadcastPacket($target, $pk->setChannel(Network::CHANNEL_ENTITY_SPAWNING));
Server::broadcastPacket($target, $pk);
foreach($target as $player){
if($player === $this->getHolder()){
$this->sendSlot($this->getHeldItemSlot(), $player);
@ -310,7 +310,7 @@ class PlayerInventory extends BaseInventory{
$pk->eid = $this->getHolder()->getId();
$pk->slots = $armor;
$pk->encode();
$pk->setChannel(Network::CHANNEL_ENTITY_SPAWNING);
$pk;
$pk->isEncoded = true;
foreach($target as $player){
@ -369,7 +369,7 @@ class PlayerInventory extends BaseInventory{
$pk2->item = $this->getItem($index);
$player->dataPacket($pk2);
}else{
$player->dataPacket($pk->setChannel(Network::CHANNEL_ENTITY_SPAWNING));
$player->dataPacket($pk);
}
}
}
@ -383,7 +383,7 @@ class PlayerInventory extends BaseInventory{
}
$pk = new ContainerSetContentPacket();
$pk->setChannel(Network::CHANNEL_WORLD_EVENTS);
$pk;
$pk->slots = [];
for($i = 0; $i < $this->getSize(); ++$i){ //Do not send armor by error here
$pk->slots[$i] = $this->getItem($i);
@ -416,7 +416,7 @@ class PlayerInventory extends BaseInventory{
}
$pk = new ContainerSetSlotPacket();
$pk->setChannel(Network::CHANNEL_WORLD_EVENTS);
$pk;
$pk->slot = $index;
$pk->item = clone $this->getItem($index);