From 9a530b9dd13cc8616df9475dc1936d21d4a082a7 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Fri, 27 Oct 2023 11:37:17 +0300 Subject: [PATCH] delayBeforePickup --- src/entity/Entity.php | 6 +++++- src/entity/object/ItemEntity.php | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/entity/Entity.php b/src/entity/Entity.php index 6b01beda..3674b8cc 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -26,6 +26,7 @@ class Entity extends Position public $eid; public $type; public $name; + public $delayBeforePickup; public $x, $y, $z; public $speedX, $speedY, $speedZ, $speed; public $lastX = 0, $lastY = 0, $lastZ = 0, $lastYaw = 0, $lastPitch = 0, $lastTime = 0, $lastHeadYaw = 0, $lastSpeedX = 0, $lastSpeedY = 0, $lastSpeedZ = 0; @@ -338,7 +339,7 @@ class Entity extends Position $time = microtime(true); if($this->class === ENTITY_PLAYER and ($this->player instanceof Player) and $this->player->spawned === true and $this->player->blocked !== true && ! $this->dead){ foreach($this->server->api->entity->getRadius($this, 2, ENTITY_ITEM) as $item){ //TODO vanilla method of searching/radius - if(!$item->closed && $item->spawntime > 0 && ($time - $item->spawntime) >= 0.6){ + if(!$item->closed && $item->spawntime > 0 && $item->delayBeforePickup == 0){ if((($this->player->gamemode & 0x01) === 1 || $this->player->hasSpace($item->type, $item->meta, $item->stack) === true) && $this->server->api->dhandle("player.pickup", array( "eid" => $this->player->eid, "player" => $this->player, @@ -668,6 +669,9 @@ class Entity extends Position if($this->knockbackTime > 0){ --$this->knockbackTime; } + if($this->delayBeforePickup > 0){ + --$this->delayBeforePickup; + } if($this->moveTime > 0){ --$this->moveTime; } diff --git a/src/entity/object/ItemEntity.php b/src/entity/object/ItemEntity.php index 2fed0ea7..ed93d184 100644 --- a/src/entity/object/ItemEntity.php +++ b/src/entity/object/ItemEntity.php @@ -20,5 +20,6 @@ class ItemEntity extends Entity{ $this->setHealth(5, "generic"); $this->setSize(0.25, 0.25); $this->gravity = 0.04; + $this->delayBeforePickup = 20; } -} \ No newline at end of file +}