Merge remote-tracking branch 'origin/master' into mcpe-0.12

This commit is contained in:
Shoghi Cervantes 2015-09-05 18:22:28 +02:00
commit 8f24306d65

View File

@ -1691,7 +1691,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
if($this->isCreative()){ if($this->isCreative()){
$this->inventory->setHeldItemSlot(0); $this->inventory->setHeldItemSlot(0);
}else{ }else{
$this->inventory->setHeldItemSlot(0); $this->inventory->setHeldItemSlot($this->inventory->getHotbarSlotIndex(0));
} }
$pk = new PlayStatusPacket(); $pk = new PlayStatusPacket();