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

Added armor change $source parameter

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-09-29 17:50:48 +02:00
parent 706e1099a1
commit 762c27affe
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/Player.php
View File

@ -1722,21 +1722,19 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$s = Item::get($s + 256, 0, 1); $s = Item::get($s + 256, 0, 1);
} }
$slot = $this->inventory->getArmorItem($i); $slot = $this->inventory->getArmorItem($i);
if($slot->getID() !== Item::AIR and $s->getID() === Item::AIR){ 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->inventory->setArmorItem($i, Item::get(Item::AIR, 0, 1), $this);
$this->inventory->addItem($slot); $this->inventory->addItem($slot);
$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)) === false){ if($this->inventory->setArmorItem($i, $this->inventory->getItem($sl), $this) === false){
$this->inventory->sendContents($this);
$this->inventory->sendArmorContents($this); $this->inventory->sendArmorContents($this);
}else{ }else{
$this->inventory->setItem($sl, Item::get(Item::AIR, 0, 1), $this); $this->inventory->setItem($sl, Item::get(Item::AIR, 0, 1), $this);
$this->inventory->sendArmorContents($this); $this->inventory->sendArmorContents($this);
} }
}elseif($s->getID() !== Item::AIR and $slot->getID() !== Item::AIR and ($slot->getID() !== $s->getID() or $slot->getDamage() !== $s->getDamage()) and ($sl = $this->inventory->first($s)) !== -1){ }elseif($s->getID() !== Item::AIR and $slot->getID() !== Item::AIR and ($slot->getID() !== $s->getID() or $slot->getDamage() !== $s->getDamage()) and ($sl = $this->inventory->first($s)) !== -1){
if($this->inventory->setArmorItem($i, $this->inventory->getItem($sl)) === false){ if($this->inventory->setArmorItem($i, $this->inventory->getItem($sl), $this) === false){
$this->inventory->sendContents($this);
$this->inventory->sendArmorContents($this); $this->inventory->sendArmorContents($this);
}else{ }else{
$this->inventory->setItem($sl, $slot, $this); $this->inventory->setItem($sl, $slot, $this);

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

@ -160,8 +160,8 @@ class PlayerInventory extends BaseInventory{
return $this->getItem($this->getSize() + $index); return $this->getItem($this->getSize() + $index);
} }
public function setArmorItem($index, Item $item){ public function setArmorItem($index, Item $item, $source = null){
return $this->setItem($this->getSize() + $index, $item); return $this->setItem($this->getSize() + $index, $item, $source);
} }
public function getHelmet(){ public function getHelmet(){