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

Improved slot selection on creative mode, closes #2960

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-04-30 12:53:03 +02:00
parent fb257c16f1
commit 923be2fffc
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pocketmine/Player.php
View File

@ -1743,6 +1743,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
break; break;
}elseif($this->isCreative()){ }elseif($this->isCreative()){
$this->inventory->setHeldItemIndex($packet->selectedSlot); $this->inventory->setHeldItemIndex($packet->selectedSlot);
$this->inventory->setItem($slot, $item);
$this->inventory->setHeldItemSlot($slot); $this->inventory->setHeldItemSlot($slot);
}else{ }else{
if($packet->selectedSlot >= 0 and $packet->selectedSlot < $this->inventory->getHotbarSize()){ if($packet->selectedSlot >= 0 and $packet->selectedSlot < $this->inventory->getHotbarSize()){

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

@ -108,13 +108,6 @@ class PlayerInventory extends BaseInventory{
$itemIndex = $this->getHeldItemIndex(); $itemIndex = $this->getHeldItemIndex();
for($i = 0; $i < $this->getHotbarSize(); ++$i){
if($this->getHotbarSlotIndex($i) === $slot){
$itemIndex = $i;
break;
}
}
if($this->getHolder() instanceof Player){ if($this->getHolder() instanceof Player){
Server::getInstance()->getPluginManager()->callEvent($ev = new PlayerItemHeldEvent($this->getHolder(), $item, $slot, $itemIndex)); Server::getInstance()->getPluginManager()->callEvent($ev = new PlayerItemHeldEvent($this->getHolder(), $item, $slot, $itemIndex));
if($ev->isCancelled()){ if($ev->isCancelled()){
@ -124,7 +117,6 @@ class PlayerInventory extends BaseInventory{
} }
$this->setHotbarSlotIndex($itemIndex, $slot); $this->setHotbarSlotIndex($itemIndex, $slot);
$this->setHeldItemIndex($itemIndex);
} }
} }