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

Send PlayerArmorEquipmentPacket instead of ContainerSetContentPacket with id 0x78

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-09-29 23:43:52 +02:00
parent 215691f1c4
commit f888acbd7c
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/Player.php
View File

@ -1724,7 +1724,12 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$slot = $this->inventory->getArmorItem($i); $slot = $this->inventory->getArmorItem($i);
if($slot->getID() !== Item::AIR and $s->getID() === Item::AIR){ //Removes a piece of armor if($slot->getID() !== Item::AIR and $s->getID() === Item::AIR){ //Removes a piece of armor
$this->inventory->setArmorItem($i, Item::get(Item::AIR, 0, 1), $this); $this->inventory->setArmorItem($i, Item::get(Item::AIR, 0, 1), $this);
$this->inventory->addItem($slot); $sl = $this->inventory->firstEmpty();
if($sl === -1){
$this->inventory->sendContents($this);
}else{
$this->inventory->setItem($sl, $slot, $this);
}
$this->inventory->sendArmorContents($this); $this->inventory->sendArmorContents($this);
}elseif($s->getID() !== Item::AIR and $slot->getID() === Item::AIR and ($sl = $this->inventory->first($s)) !== -1){ }elseif($s->getID() !== Item::AIR and $slot->getID() === Item::AIR and ($sl = $this->inventory->first($s)) !== -1){
if($this->inventory->setArmorItem($i, $this->inventory->getItem($sl), $this) === false){ if($this->inventory->setArmorItem($i, $this->inventory->getItem($sl), $this) === false){

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

@ -293,9 +293,13 @@ class PlayerInventory extends BaseInventory{
foreach($target as $player){ foreach($target as $player){
if($player === $this->getHolder()){ if($player === $this->getHolder()){
/** @var Player $player */ /** @var Player $player */
$pk2 = clone $pk;
$pk2->eid = 0;
/*
$pk2 = new ContainerSetContentPacket; $pk2 = new ContainerSetContentPacket;
$pk2->windowid = 0x78; //Armor window id constant $pk2->windowid = 0x78; //Armor window id constant
$pk2->slots = $armor; $pk2->slots = $armor;
*/
$player->dataPacket($pk2); $player->dataPacket($pk2);
}else{ }else{
$player->dataPacket(clone $pk); $player->dataPacket(clone $pk);