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

Cleaned up item & arrow pickup code

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-11-15 12:14:25 +00:00
parent bbbed22467
commit 3a16985d45
4 changed files with 70 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/pocketmine/entity/projectile/Arrow.php
View File

@ -24,8 +24,13 @@ declare(strict_types=1);
namespace pocketmine\entity\projectile;
use pocketmine\entity\Entity;
use pocketmine\event\inventory\InventoryPickupArrowEvent;
use pocketmine\item\ItemFactory;
use pocketmine\item\Item as ItemItem;
use pocketmine\level\Level;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\network\mcpe\protocol\TakeItemEntityPacket;
use pocketmine\Player;
class Arrow extends Projectile{
const NETWORK_ID = self::ARROW;
@ -78,4 +83,30 @@ class Arrow extends Projectile{
return $hasUpdate;
}
public function onCollideWithPlayer(Player $player){
if(!$this->hadCollision){
return;
}
$item = ItemFactory::get(ItemItem::ARROW, 0, 1);
$playerInventory = $player->getInventory();
if($player->isSurvival() and !$playerInventory->canAddItem($item)){
return;
}
$this->server->getPluginManager()->callEvent($ev = new InventoryPickupArrowEvent($playerInventory, $this));
if($ev->isCancelled()){
return;
}
$pk = new TakeItemEntityPacket();
$pk->eid = $player->getId();
$pk->target = $this->getId();
$this->server->broadcastPacket($this->getViewers(), $pk);
$playerInventory->addItem(clone $item);
$this->flagForDespawn();
}
}