Merge branch 'master' of github.com:PocketMine/PocketMine-MP

This commit is contained in:
Shoghi Cervantes 2014-07-28 12:12:14 +02:00
commit e219f4784c

View File

@ -1360,7 +1360,6 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
Block::$creative[$packet->slot][1],
1
);
$this->inventory->setHeldItemSlot(0);
$this->inventory->setItemInHand($item);
}else{
$this->inventory->setHeldItemSlot($packet->slot);
@ -1891,6 +1890,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
if($packet->slot > $this->inventory->getSize()){
break;
}
$this->inventory->setHeldItemSlot($packet->slot);
$transaction = new BaseTransaction($this->inventory, $packet->slot, $this->inventory->getItem($packet->slot), $packet->item);
}elseif(isset($this->windowIndex[$packet->windowid])){
$this->craftingType = 0;
@ -2395,4 +2395,4 @@ if(is_numeric($data["cause"])){
}
}
Player::broadcastMessage($data["player"]->getName() . $message);
*/
*/