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

Less complete inventory sending

Browse Source
This commit is contained in:
Shoghi Cervantes 2013-06-09 13:51:45 +02:00
parent 099bedf8ee
commit 2f6ddb6aa4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Player.php
View File

@ -650,15 +650,15 @@ class Player{
$s = $this->getSlot($slot); $s = $this->getSlot($slot);
$s->count -= $item->count; $s->count -= $item->count;
if($s->count <= 0){ if($s->count <= 0){
$this->setSlot($slot, BlockAPI::getItem(AIR, 0, 0)); $this->setSlot($slot, BlockAPI::getItem(AIR, 0, 0), false);
} }
} }
foreach($craft as $slot => $item){ foreach($craft as $slot => $item){
$s = $this->getSlot($slot); $s = $this->getSlot($slot);
if($s->count <= 0 or $s->getID() === AIR){ if($s->count <= 0 or $s->getID() === AIR){
$this->setSlot($slot, BlockAPI::getItem($item->getID(), $item->getMetadata(), $item->count)); $this->setSlot($slot, BlockAPI::getItem($item->getID(), $item->getMetadata(), $item->count), false);
}else{ }else{
$this->setSlot($slot, BlockAPI::getItem($item->getID(), $item->getMetadata(), $s->count + $item->count)); $this->setSlot($slot, BlockAPI::getItem($item->getID(), $item->getMetadata(), $s->count + $item->count), false);
} }
} }
} }
@ -1305,7 +1305,7 @@ class Player{
$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);
$this->setSlot($sl, BlockAPI::getItem(AIR, 0, 0)); $this->setSlot($sl, BlockAPI::getItem(AIR, 0, 0), false);
}else{ }else{
$data["slot$i"] = 0; $data["slot$i"] = 0;
} }
@ -1479,7 +1479,7 @@ class Player{
$data["item"] = $this->getSlot($this->slot); $data["item"] = $this->getSlot($this->slot);
if($this->blocked === false and $this->server->handle("player.drop", $data) !== false){ if($this->blocked === false and $this->server->handle("player.drop", $data) !== false){
$this->server->api->entity->drop(new Position($this->entity->x - 0.5, $this->entity->y, $this->entity->z - 0.5, $this->level), $data["item"]); $this->server->api->entity->drop(new Position($this->entity->x - 0.5, $this->entity->y, $this->entity->z - 0.5, $this->level), $data["item"]);
$this->setSlot($this->slot, BlockAPI::getItem(AIR, 0, 0)); $this->setSlot($this->slot, BlockAPI::getItem(AIR, 0, 0), false);
} }
if($this->entity->inAction === true){ if($this->entity->inAction === true){
$this->entity->inAction = false; $this->entity->inAction = false;
@ -1625,7 +1625,7 @@ class Player{
} }
$this->addItem($slot->getID(), $slot->getMetadata(), $slot->count); $this->addItem($slot->getID(), $slot->getMetadata(), $slot->count);
} }
$tile->setSlot($data["slot"], $item); $tile->setSlot($data["slot"], $item, false);
break; break;
case MC_SEND_INVENTORY: //TODO, Mojang, enable this ´^_^` case MC_SEND_INVENTORY: //TODO, Mojang, enable this ´^_^`
if($this->spawned === false){ if($this->spawned === false){