From 2678243d8ba6bb599a438e545c9e622b46f8f2d5 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Tue, 26 Mar 2024 06:26:32 +0300 Subject: [PATCH] tnt will not regenerate you now + will add knockback to players --- src/entity/object/PrimedTNT.php | 15 ---------- src/world/Explosion.php | 49 +++++++++++++++++++++++++++------ src/world/Level.php | 16 +++++------ src/world/MobSpawner.php | 2 +- 4 files changed, 50 insertions(+), 32 deletions(-) diff --git a/src/entity/object/PrimedTNT.php b/src/entity/object/PrimedTNT.php index b25578a3..f88adb7e 100644 --- a/src/entity/object/PrimedTNT.php +++ b/src/entity/object/PrimedTNT.php @@ -13,7 +13,6 @@ class PrimedTNT extends Entity{ $this->setSize(0.98, 0.98); $this->yOffset = $this->height / 2; $this->setHealth(10000000, "generic"); - //$this->server->schedule(5, [$this, "updateFuse"], [], true); } public function isPickable(){ @@ -66,20 +65,6 @@ class PrimedTNT extends Entity{ $this->lastUpdate = $now; } - /*public function updateFuse(){ - if($this->closed === true){ - return false; - } - if($this->type === OBJECT_PRIMEDTNT){ - $this->updateMetadata(); - if(((microtime(true) - $this->spawntime) * 20) >= $this->data["fuse"]){ - $this->close(); - $explosion = new Explosion($this, $this->data["power"]); - $explosion->explode(); - } - } - }*/ - public function spawn($player){ $pk = new AddEntityPacket; $pk->eid = $this->eid; diff --git a/src/world/Explosion.php b/src/world/Explosion.php index 9dc1217a..96514a0e 100644 --- a/src/world/Explosion.php +++ b/src/world/Explosion.php @@ -60,10 +60,32 @@ class Explosion{ $radius = 2 * $this->size; $server = ServerAPI::request(); if(!Explosion::$enableExplosions){ /*Disable Explosions*/ - foreach($server->api->entity->getRadius($this->source, $radius) as $entity){ - $impact = (1 - $this->source->distance($entity) / $radius) * 0.5; //pla> - $damage = (int) (($impact * $impact + $impact) * 8 * $this->size + 1); - $entity->harm($damage, "explosion"); + foreach($server->api->entity->getRadius($this->source, $radius+1) as $entity){ + $distance = $this->source->distance($entity); + $distByRad = $distance / $this->size; + if($distByRad <= 1 && $distance != 0){ + $diffX = ($entity->x - $this->source->x) / $distance; + $diffY = ($entity->y + $entity->getEyeHeight() - $this->source->y) / $distance; + $diffZ = ($entity->z - $this->source->z) / $distance; + + $impact = (1 - $distByRad) * 0.5; //TODO calculate block density around the entity instead of 0.5 + $damage = (int) (($impact * $impact + $impact) * 8 * $this->size + 1); + if($damage > 0){ + $entity->harm($damage, "explosion"); + $entity->speedX = $diffX * $impact; + $entity->speedY = $diffY * $impact; + $entity->speedZ = $diffZ * $impact; + + if($entity->isPlayer()){ + $pk = new SetEntityMotionPacket(); + $pk->eid = 0; //XXX change + $pk->speedX = $entity->speedX; + $pk->speedY = $entity->speedY; + $pk->speedZ = $entity->speedZ; + $entity->player->dataPacket($pk); + } + } + } } $pk = new ExplodePacket; //sound fix $pk->x = $this->source->x; @@ -136,10 +158,21 @@ class Explosion{ $impact = (1 - $distByRad) * 0.5; //TODO calculate block density around the entity instead of 0.5 $damage = (int) (($impact * $impact + $impact) * 8 * $this->size + 1); - $entity->harm($damage, "explosion"); - $entity->speedX = $diffX * $impact; //TODO check is needed for player? - $entity->speedY = $diffY * $impact; - $entity->speedZ = $diffZ * $impact; + if($damage > 0){ + $entity->harm($damage, "explosion"); + $entity->speedX = $diffX * $impact; + $entity->speedY = $diffY * $impact; + $entity->speedZ = $diffZ * $impact; + + if($entity->isPlayer()){ + $pk = new SetEntityMotionPacket(); + $pk->eid = 0; //XXX change + $pk->speedX = $entity->speedX; + $pk->speedY = $entity->speedY; + $pk->speedZ = $entity->speedZ; + $entity->player->dataPacket($pk); + } + } } } diff --git a/src/world/Level.php b/src/world/Level.php index 3f3cfb5b..3087e603 100644 --- a/src/world/Level.php +++ b/src/world/Level.php @@ -494,8 +494,15 @@ class Level{ } $this->totalMobsAmount = 0; $post = []; - //console($this->getName()); + foreach($this->entityList as $k => $e){ + if(!($e instanceof Entity)){ + unset($this->entityList[$k]); + unset($this->server->entities[$k]); + //TODO try to remove from $entityListPositioned? + continue; + } + $dd = CORRECT_ENTITY_CLASSES[$e->class] ?? false; if($dd === false || ($dd !== true && !isset($dd[$e->type]))){ ConsoleAPI::warn("Entity $k has invalid entity! {$e->class} {$e->type}"); @@ -514,13 +521,6 @@ class Level{ continue; } - - if(!($e instanceof Entity)){ - unset($this->entityList[$k]); - unset($this->server->entities[$k]); - //TODO try to remove from $entityListPositioned? - continue; - } $curChunkX = (int)$e->x >> 4; $curChunkZ = (int)$e->z >> 4; if($e->class === ENTITY_MOB && !$e->isPlayer()){ diff --git a/src/world/MobSpawner.php b/src/world/MobSpawner.php index e36090b2..768db8e5 100644 --- a/src/world/MobSpawner.php +++ b/src/world/MobSpawner.php @@ -58,7 +58,7 @@ class MobSpawner{ $type = mt_rand(10, 13); $baby = false; $grassOnly = true; - }elseif(self::$spawnMobs && ($phase == "night" || $phase == "sunset")){ //Monster, true night + }elseif(self::$spawnMobs && ($phase == "night" || $phase == "sunset") && $this->server->difficulty > 0){ //Monster, true night $type = mt_rand(32, 35); $grassOnly = false; $baby = 2;