From 9ee4b08657fd5571f8c8d1882a2b6ad4abea5370 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Mon, 4 Mar 2024 07:18:40 +0300 Subject: [PATCH] reworked mob spawn, added mob despawn if far away, mobs will not die if their pos is >255 or <0, getBlockID/getBlock return INVISIBLE_BEDROCK if pos >255 or <0 (xz) --- src/API/EntityAPI.php | 10 ++++- src/entity/Entity.php | 8 ++-- src/entity/Living.php | 7 +++- src/pmf/PMFLevel.php | 11 +++++- src/world/Level.php | 2 +- src/world/MobSpawner.php | 85 +++++++++++++++++++++++++++++++++------- 6 files changed, 98 insertions(+), 25 deletions(-) diff --git a/src/API/EntityAPI.php b/src/API/EntityAPI.php index 95f55ead..9acb925a 100644 --- a/src/API/EntityAPI.php +++ b/src/API/EntityAPI.php @@ -184,12 +184,18 @@ class EntityAPI{ public function remove($eid){ if(isset($this->entities[$eid])){ + $level = $this->entities[$eid]->level; $this->entities[$eid]->closed = true; - if($this->entities[$eid]->level instanceof Level){ + if($level instanceof Level){ $cX = (int)$this->entities[$eid]->x >> 4; $cZ = (int)$this->entities[$eid]->z >> 4; $index = "$cX $cZ"; - unset($this->entities[$eid]->level->entityListPositioned[$index][$eid]); + unset($level->entityListPositioned[$index][$eid]); + if(isset($level->mobSpawner->entityAffectedPlayers[$eid])){ + $pid = $level->mobSpawner->entityAffectedPlayers[$eid]; + unset($level->mobSpawner->entityAffectedPlayers[$eid]); + unset($level->mobSpawner->playerAffectedEIDS[$pid][$eid]); + } } if($this->entities[$eid]->isPlayer()){ $pk = new RemovePlayerPacket; diff --git a/src/entity/Entity.php b/src/entity/Entity.php index 061fab04..14a0da74 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -414,10 +414,10 @@ class Entity extends Position } } - if($this->class !== ENTITY_PLAYER and ($this->x <= 0 or $this->z <= 0 or $this->x >= 256 or $this->z >= 256 or $this->y >= 128 or $this->y <= 0)){ - $this->close(); - return false; - } + //if($this->class !== ENTITY_PLAYER and ($this->x <= 0 or $this->z <= 0 or $this->x >= 256 or $this->z >= 256 or $this->y >= 128 or $this->y <= 0)){ + // $this->close(); + // return false; + //} if($this->dead === true){ $this->fire = 0; diff --git a/src/entity/Living.php b/src/entity/Living.php index 3ce58603..fd0cc3e9 100644 --- a/src/entity/Living.php +++ b/src/entity/Living.php @@ -90,7 +90,12 @@ abstract class Living extends Entity implements Pathfindable{ return; } if($this->closed) return; - + + $check = $this->level->mobSpawner->checkDespawn($this); + if($check){ + $this->close(); + return; + } parent::update($now); } diff --git a/src/pmf/PMFLevel.php b/src/pmf/PMFLevel.php index 859af005..0eb99304 100644 --- a/src/pmf/PMFLevel.php +++ b/src/pmf/PMFLevel.php @@ -332,7 +332,11 @@ class PMFLevel extends PMF{ } public function getBlockID($x, $y, $z){ - if($x < 0 || $x > 255 || $z < 0 || $z > 255 || $y < 0 || $y > 127){ + if($x < 0 || $x > 255 || $z < 0 || $z > 255){ + return INVISIBLE_BEDROCK; + } + + if($y > 127 || $y < 0){ return 0; } $X = $x >> 4; @@ -428,7 +432,10 @@ class PMFLevel extends PMF{ } public function getBlock($x, $y, $z){ - if($x < 0 || $x > 255 || $z < 0 || $z > 255 || $y < 0 || $y > 127){ + if($x < 0 || $x > 255 || $z < 0 || $z > 255){ + return [INVISIBLE_BEDROCK, 0]; + } + if($y < 0 || $y > 127){ return [AIR, 0]; } diff --git a/src/world/Level.php b/src/world/Level.php index 2ae976c7..58f43b5a 100644 --- a/src/world/Level.php +++ b/src/world/Level.php @@ -467,7 +467,7 @@ class Level{ $this->checkSleep(); - if($server->ticks % 40 === 0){ //40 ticks delay + if($server->ticks % 10 === 0){ //10 ticks delay $this->mobSpawner->handle(); } diff --git a/src/world/MobSpawner.php b/src/world/MobSpawner.php index 9f502c92..1b344bb8 100644 --- a/src/world/MobSpawner.php +++ b/src/world/MobSpawner.php @@ -1,10 +1,14 @@ server = ServerAPI::request(); $this->level = $level; @@ -13,11 +17,38 @@ class MobSpawner{ public function countEntities(){ return $this->level->totalMobsAmount; } - + + public function checkDespawn(Living $living){ + if(!isset($this->entityAffectedPlayers[$living->eid])){ + return false; + } + + $playerID = $this->entityAffectedPlayers[$living->eid]; + $player = $this->level->entityList[$playerID] ?? false; + if($player === false){ + //TODO try retargetting other player? + return true; + }else{ + $diffX = $living->x - $player->x; + $diffZ = $living->z - $player->z; + $dist = $diffX*$diffX + $diffZ*$diffZ; + if($dist <= 512){ + return false; + } + + return $dist > 4096 || mt_rand($dist, 4096) == $dist; //force despawn 64 blocks away or despawn randomly + } + + } + public function handle(){ if($this->countEntities() > self::$MOB_LIMIT || count($this->level->players) <= 0){ return false; //not spawning } + $svd = $this->totalMobsPerPlayer; + $this->totalMobsPerPlayer = min(ceil(self::$MOB_LIMIT / count($this->level->players)), self::$maxMobsNearPlayerAtOnce); + if($svd != $this->totalMobsPerPlayer) ConsoleAPI::debug("Changed total mobs per player from $svd to {$this->totalMobsPerPlayer}."); + return $this->spawnMobs(); } @@ -34,21 +65,45 @@ class MobSpawner{ }else{ return false; } - $x = mt_rand(0,255); - $z = mt_rand(0,255); - $y = $this->getSafeY($x, $z, $grassOnly, $type >= 32 && $type <= 36 && $type != 35); - if(!$y || $y < 0){ - return false; - } - $data = $this->genPosData($x, $y + 0.5, $z); - if($baby != 2) $data["IsBaby"] = $baby; - $e = $this->server->api->entity->add($this->level, 2, $type, $data); - - if($e instanceof Entity){ - $this->server->api->entity->spawnToAll($e); - //console("[DEBUG] $type spawned at $x, $y, $z"); + foreach($this->level->players as $player){ + + if(isset($this->playerAffectedEIDS[$player->entity->eid]) && count($this->playerAffectedEIDS[$player->entity->eid]) > $this->totalMobsPerPlayer){ + continue; + } + + $x = mt_rand($player->entity->x - 32, $player->entity->x + 32); + $z = mt_rand($player->entity->z - 32, $player->entity->z + 32); + $diffX = $x-$player->entity->x; + $diffZ = $z-$player->entity->z; + $dist = $diffX*$diffX + $diffZ*$diffZ; + if($dist < 768){ + continue; + } + + $y = $this->getSafeY($x, $z, $grassOnly, $type >= 32 && $type <= 36 && $type != 35); + if(!$y || $y < 0){ + continue; + } + $data = $this->genPosData($x, $y + 0.5, $z); + if($baby != 2) $data["IsBaby"] = $baby; + + $e = $this->server->api->entity->add($this->level, 2, $type, $data); + + if($e instanceof Entity){ + $this->server->api->entity->spawnToAll($e); + console("[DEBUG] $type spawned at $x, $y, $z"); + } + if(!isset($this->playerAffectedEIDS[$player->entity->eid])){ + $this->playerAffectedEIDS[$player->entity->eid] = [$e->eid => true]; + }else{ + $this->playerAffectedEIDS[$player->entity->eid][$e->eid] = true; + } + + $this->entityAffectedPlayers[$e->eid] = $player->entity->eid; } + + return true; }