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

Fixed armor hotbar reset bug

Browse Source
This commit is contained in:
Shoghi Cervantes 2013-08-19 16:51:40 +02:00
parent 7e6758fb60
commit 78c242eac4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Player.php
View File

@ -1379,7 +1379,7 @@ class Player{
} }
$slot = $this->armor[$i]; $slot = $this->armor[$i];
if($slot->getID() !== AIR and $s->getID() === AIR){ if($slot->getID() !== AIR and $s->getID() === AIR){
$this->addItem($slot->getID(), $slot->getMetadata(), 1); $this->addItem($slot->getID(), $slot->getMetadata(), 1, false);
$this->armor[$i] = BlockAPI::getItem(AIR, 0, 0); $this->armor[$i] = BlockAPI::getItem(AIR, 0, 0);
}elseif($s->getID() !== AIR and $slot->getID() === AIR and ($sl = $this->hasItem($s->getID())) !== false){ }elseif($s->getID() !== AIR and $slot->getID() === AIR and ($sl = $this->hasItem($s->getID())) !== false){
$this->armor[$i] = $this->getSlot($sl); $this->armor[$i] = $this->getSlot($sl);
@ -1614,7 +1614,7 @@ class Player{
if($this->spawned === false or $this->blocked === true){ if($this->spawned === false or $this->blocked === true){
break; break;
} }
if($this->lastCraft <= (microtime(true) - 1)){ if($this->lastCraft <= (microtime(true) - 1)){
if(isset($this->toCraft[-1])){ if(isset($this->toCraft[-1])){
$this->toCraft = array(-1 => $this->toCraft[-1]); $this->toCraft = array(-1 => $this->toCraft[-1]);
@ -1638,7 +1638,7 @@ class Player{
} }
$this->toCraft[$data["slot"]] = $craftItem; $this->toCraft[$data["slot"]] = $craftItem;
$craft = true; $craft = true;
}elseif(((count($this->toCraft) === 1 and isset($this->toCraft[-1])) or count($this->toCraft) === 0) and $slot->count > 0 and $slot->getID() !== AIR and ($slot->getID() !== $data["block"] or $slot->getMetadata() !== $data["meta"])){ //Crafting final }elseif(((count($this->toCraft) === 1 and isset($this->toCraft[-1])) or count($this->toCraft) === 0) and $slot->count > 0 and $slot->getID() > AIR and ($slot->getID() !== $data["block"] or $slot->getMetadata() !== $data["meta"])){ //Crafting final
$craftItem = BlockAPI::getItem($data["block"], $data["meta"], $data["stack"]); $craftItem = BlockAPI::getItem($data["block"], $data["meta"], $data["stack"]);
if(count($this->toCraft) === 0){ if(count($this->toCraft) === 0){
$this->toCraft[-1] = 0; $this->toCraft[-1] = 0;
@ -1648,7 +1648,6 @@ class Player{
$this->toCraft[$data["slot"]] = $craftItem; $this->toCraft[$data["slot"]] = $craftItem;
$craft = true; $craft = true;
} }
if($craft === true){ if($craft === true){
$this->lastCraft = microtime(true); $this->lastCraft = microtime(true);