From 577e00378e9b19a37068e9ea4b140fc358064dea Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Sun, 26 Jun 2022 06:03:19 +0300 Subject: [PATCH] added separated class for arrows --- src/entity/Entity.php | 22 +++----------------- src/entity/EntityRegistry.php | 1 + src/entity/Projectile.php | 6 ++++++ src/entity/object/Arrow.php | 39 +++++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 19 deletions(-) diff --git a/src/entity/Entity.php b/src/entity/Entity.php index 262adeb3..8bee38c7 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -142,7 +142,7 @@ class Entity extends Position{ $this->setHealth(10000000, "generic"); $this->server->schedule(5, array($this, "updateFuse"), array(), true); $this->update(); - }elseif($this->type === (OBJECT_ARROW or OBJECT_SNOWBALL)){ + }elseif($this->type === OBJECT_SNOWBALL){ $this->server->schedule(1210, array($this, "update")); //Despawn $this->update(); }elseif($this->type == OBJECT_MINECART){ @@ -241,9 +241,9 @@ class Entity extends Position{ $this->close(); //Despawn timer return false; } - }elseif($this->class === ENTITY_OBJECT and ($this->type === OBJECT_ARROW or OBJECT_SNOWBALL)){ + }elseif($this->class === ENTITY_OBJECT and $this->type === OBJECT_SNOWBALL){ if(($time - $this->spawntime) >= 60){ - $this->close(); //Despawn timer + $this->close(); return false; } } @@ -730,22 +730,6 @@ class Entity extends Position{ $pk->did = 0; $player->dataPacket($pk); - $pk = new SetEntityMotionPacket; - $pk->eid = $this->eid; - $pk->speedX = $this->speedX; - $pk->speedY = $this->speedY; - $pk->speedZ = $this->speedZ; - $player->dataPacket($pk); - }elseif($this->type === OBJECT_ARROW){ - $pk = new AddEntityPacket; - $pk->eid = $this->eid; - $pk->type = $this->type; - $pk->x = $this->x; - $pk->y = $this->y; - $pk->z = $this->z; - $pk->did = 0; - $player->dataPacket($pk); - $pk = new SetEntityMotionPacket; $pk->eid = $this->eid; $pk->speedX = $this->speedX; diff --git a/src/entity/EntityRegistry.php b/src/entity/EntityRegistry.php index 1baf4798..02a75d0c 100644 --- a/src/entity/EntityRegistry.php +++ b/src/entity/EntityRegistry.php @@ -46,6 +46,7 @@ class EntityRegistry{ self::registerEntity(Skeleton::class); self::registerEntity(Spider::class); self::registerEntity(Zombie::class); + self::registerEntity(Arrow::class); } /*Register an Entity*/ diff --git a/src/entity/Projectile.php b/src/entity/Projectile.php index e69de29b..4536974d 100644 --- a/src/entity/Projectile.php +++ b/src/entity/Projectile.php @@ -0,0 +1,6 @@ +server->schedule(1210, array($this, "update")); //Despawn + $this->update(); + } + + public function environmentUpdate(){ + parent::environmentUpdate(); + $time = microtime(true); + if(($time - $this->spawntime) >= 60){ + $this->close(); + return false; + } + } + + public function spawn($player){ + if($this->type === OBJECT_ARROW){ + $pk = new AddEntityPacket; + $pk->eid = $this->eid; + $pk->type = $this->type; + $pk->x = $this->x; + $pk->y = $this->y; + $pk->z = $this->z; + $pk->did = 0; + $player->dataPacket($pk); + + $pk = new SetEntityMotionPacket; + $pk->eid = $this->eid; + $pk->speedX = $this->speedX; + $pk->speedY = $this->speedY; + $pk->speedZ = $this->speedZ; + $player->dataPacket($pk); + } + } +} \ No newline at end of file