removed useless classes, entities are not in database anymore

This commit is contained in:
GameHerobrine 2024-01-09 05:19:36 +03:00
parent af7293d4d7
commit 1bbe5c7582
14 changed files with 43 additions and 77 deletions

View file

@ -204,22 +204,27 @@ class EntityAPI{
$this->server->api->dhandle("entity.remove", $this->entities[$eid]); $this->server->api->dhandle("entity.remove", $this->entities[$eid]);
unset($this->entities[$eid]->level->entityList[$eid]); unset($this->entities[$eid]->level->entityList[$eid]);
unset($this->entities[$eid]); unset($this->entities[$eid]);
$this->server->query("DELETE FROM entities WHERE EID = " . $eid . ";");
} }
} }
public function getRadius(Position $center, $radius = 15, $class = false){ public function getRadius(Position $center, $radius = 15, $class = false){
$entities = []; $minChunkX = ((int)($center->x - $radius)) >> 4;
$l = $this->server->query("SELECT EID FROM entities WHERE level = '" . $center->level->getName() . "' " . ($class !== false ? "AND class = $class " : "") . "AND abs(x - {$center->x}) <= $radius AND abs(y - {$center->y}) <= $radius AND abs(z - {$center->z}) <= $radius;"); $minChunkZ = ((int)($center->z - $radius)) >> 4;
if($l !== false and $l !== true){ $maxChunkX = ((int)($center->x + $radius)) >> 4;
while(($e = $l->fetchArray(SQLITE3_ASSOC)) !== false){ $maxChunkZ = ((int)($center->z - $radius)) >> 4;
$e = $this->get($e["EID"]); $ents = [];
if($e instanceof Entity){ //TODO also index by chunkY?
$entities[$e->eid] = $e; for($chunkX = $minChunkX; $chunkX <= $maxChunkX; ++$chunkX){
for($chunkZ = $minChunkZ; $chunkZ <= $maxChunkZ; ++$chunkZ){
$ind = "$chunkX $chunkZ";
foreach($center->level->entityListPositioned[$ind] ?? [] as $entid){
if($this->entities[$entid] instanceof Entity && ($class === false || $this->entities[$entid]->class == $class)){
$ents[$entid] = $this->entities[$entid];
}
} }
} }
} }
return $entities; return $ents;
} }
public function heal($eid, $heal, $cause){ public function heal($eid, $heal, $cause){

View file

@ -32,7 +32,7 @@ class PlayerAPI{
$this->server->api->console->cmdWhitelist("ping"); $this->server->api->console->cmdWhitelist("ping");
$this->server->api->console->cmdWhitelist("spawn"); $this->server->api->console->cmdWhitelist("spawn");
$this->server->api->console->cmdWhitelist("loc"); $this->server->api->console->cmdWhitelist("loc");
$this->server->preparedSQL->selectPlayersToHeal = $this->server->database->prepare("SELECT EID FROM entities WHERE class = " . ENTITY_PLAYER . " AND health < 20;"); //$this->server->preparedSQL->selectPlayersToHeal = $this->server->database->prepare("SELECT EID FROM entities WHERE class = " . ENTITY_PLAYER . " AND health < 20;");
} }
public function registerCmd($cmd, $help = ""){ public function registerCmd($cmd, $help = ""){
@ -43,7 +43,7 @@ class PlayerAPI{
switch($event){ switch($event){
case "server.regeneration": case "server.regeneration":
if($this->server->difficulty === 0){ if($this->server->difficulty === 0){
$result = $this->server->preparedSQL->selectPlayersToHeal->execute(); //$result = $this->server->preparedSQL->selectPlayersToHeal->execute();
if($result !== false){ if($result !== false){
while(($player = $result->fetchArray()) !== false){ while(($player = $result->fetchArray()) !== false){
if(($player = $this->server->api->entity->get($player["EID"])) !== false){ if(($player = $this->server->api->entity->get($player["EID"])) !== false){
@ -365,6 +365,7 @@ class PlayerAPI{
"z" => $player->level->getSpawn()->z, "z" => $player->level->getSpawn()->z,
]); ]);
} }
$player->level->players[$CID] = $player;
$this->server->query("INSERT OR REPLACE INTO players (CID, ip, port, name) VALUES (" . $player->CID . ", '" . $player->ip . "', " . $player->port . ", '" . strtolower($player->username) . "');"); $this->server->query("INSERT OR REPLACE INTO players (CID, ip, port, name) VALUES (" . $player->CID . ", '" . $player->ip . "', " . $player->port . ", '" . strtolower($player->username) . "');");
} }
} }
@ -434,16 +435,8 @@ class PlayerAPI{
public function getAll($level = null){ public function getAll($level = null){
if($level instanceof Level){ if($level instanceof Level){
$clients = []; //safe_var_dump($level->players);
$l = $this->server->query("SELECT EID FROM entities WHERE level = '" . $level->getName() . "' AND class = '" . ENTITY_PLAYER . "';"); return $level->players;
if($l !== false and $l !== true){
while(($e = $l->fetchArray(SQLITE3_ASSOC)) !== false){
$e = $this->getByEID($e["EID"]);
if($e instanceof Player){
$clients[$e->CID] = $e;
}
}
} return $clients;
} }
return $this->server->clients; return $this->server->clients;
@ -487,6 +480,7 @@ class PlayerAPI{
} }
$this->server->query("DELETE FROM players WHERE name = '" . $player->username . "';"); $this->server->query("DELETE FROM players WHERE name = '" . $player->username . "';");
$this->server->api->entity->remove($player->eid); $this->server->api->entity->remove($player->eid);
unset($player->level->players[$this->CID]);
if($player->entity instanceof Entity){ if($player->entity instanceof Entity){
unset($player->entity->player); unset($player->entity->player);
//unset($player->entity); //unset($player->entity);

View file

@ -204,7 +204,10 @@ class Player{
} }
$this->level->freeAllChunks($this); $this->level->freeAllChunks($this);
unset($this->level->players[$this->CID]);
$this->level = $pos->level; $this->level = $pos->level;
$this->level->players[$this->CID] = $this;
$this->chunksLoaded = []; $this->chunksLoaded = [];
$this->server->api->entity->spawnToAll($this->entity); $this->server->api->entity->spawnToAll($this->entity);
$this->server->api->entity->spawnAll($this); $this->server->api->entity->spawnAll($this);

View file

@ -729,10 +729,8 @@ class PocketMinecraftServer{
$info["tps"] = $this->getTPS(); $info["tps"] = $this->getTPS();
$info["memory_usage"] = round((memory_get_usage() / 1024) / 1024, 2) . "MB"; $info["memory_usage"] = round((memory_get_usage() / 1024) / 1024, 2) . "MB";
$info["memory_peak_usage"] = round((memory_get_peak_usage() / 1024) / 1024, 2) . "MB"; $info["memory_peak_usage"] = round((memory_get_peak_usage() / 1024) / 1024, 2) . "MB";
$info["entities"] = $this->query("SELECT count(EID) as count FROM entities;", true); $info["entities"] = count($this->entities);
$info["entities"] = $info["entities"]["count"]; $info["players"] = count($this->clients);
$info["players"] = $this->query("SELECT count(CID) as count FROM players;", true);
$info["players"] = $info["players"]["count"];
$info["events"] = count($this->eventsID); $info["events"] = count($this->eventsID);
$info["handlers"] = $this->query("SELECT count(ID) as count FROM handlers;", true); $info["handlers"] = $this->query("SELECT count(ID) as count FROM handlers;", true);
$info["handlers"] = $info["handlers"]["count"]; $info["handlers"] = $info["handlers"]["count"];

View file

@ -99,10 +99,7 @@ require_once(FILE_PATH . "/src/entity/ai/tasks/TaskBase.php");
require_once(FILE_PATH. "/src/entity/ai/tasks/TaskTempt.php"); require_once(FILE_PATH. "/src/entity/ai/tasks/TaskTempt.php");
require_once(FILE_PATH . "/src/entity/Rideable.php"); require_once(FILE_PATH . "/src/entity/Rideable.php");
require_once(FILE_PATH . "/src/entity/Attachable.php");
require_once(FILE_PATH . "/src/entity/Damageable.php");
require_once(FILE_PATH . "/src/entity/Breedable.php"); require_once(FILE_PATH . "/src/entity/Breedable.php");
require_once(FILE_PATH . "/src/entity/Damageable.php");
require_once(FILE_PATH . "/src/entity/Pathfindable.php"); require_once(FILE_PATH . "/src/entity/Pathfindable.php");
require_once(FILE_PATH . "/src/entity/Entity.php"); require_once(FILE_PATH . "/src/entity/Entity.php");
require_once(FILE_PATH . "/src/entity/Living.php"); require_once(FILE_PATH . "/src/entity/Living.php");

View file

@ -1,5 +0,0 @@
<?php
//Useless Interface
interface Attachable{
}

View file

@ -1,5 +0,0 @@
<?php
interface Damageable{
}

View file

@ -116,7 +116,6 @@ class Entity extends Position
$this->gravity = 0.08; $this->gravity = 0.08;
$this->state = $this->data["State"] = isset($this->data["State"]) ? $this->data["State"] : 0; $this->state = $this->data["State"] = isset($this->data["State"]) ? $this->data["State"] : 0;
$this->tickCounter = 0; $this->tickCounter = 0;
$this->server->query("INSERT OR REPLACE INTO entities (EID, level, type, class, health, hasUpdate) VALUES (" . $this->eid . ", '" . $this->level->getName() . "', " . $this->type . ", " . $this->class . ", " . $this->health . ", 0);");
$this->x = isset($this->data["x"]) ? (float) $this->data["x"] : 0; $this->x = isset($this->data["x"]) ? (float) $this->data["x"] : 0;
$this->y = isset($this->data["y"]) ? (float) $this->data["y"] : 0; $this->y = isset($this->data["y"]) ? (float) $this->data["y"] : 0;
$this->z = isset($this->data["z"]) ? (float) $this->data["z"] : 0; $this->z = isset($this->data["z"]) ? (float) $this->data["z"] : 0;
@ -1075,7 +1074,6 @@ class Entity extends Position
public function setName($name) public function setName($name)
{ {
$this->name = $name; $this->name = $name;
// $this->server->query("UPDATE entities SET name = '".str_replace("'", "", $this->name)."' WHERE EID = ".$this->eid.";"); is this neccessary for database?
} }
public function look($pos2) public function look($pos2)
@ -1084,7 +1082,6 @@ class Entity extends Position
$angle = Utils::angle3D($pos2, $pos); $angle = Utils::angle3D($pos2, $pos);
$this->yaw = $angle["yaw"]; $this->yaw = $angle["yaw"];
$this->pitch = $angle["pitch"]; $this->pitch = $angle["pitch"];
$this->server->query("UPDATE entities SET pitch = " . $this->pitch . ", yaw = " . $this->yaw . " WHERE EID = " . $this->eid . ";");
} }
public function move(Vector3 $pos, $yaw = 0, $pitch = 0) public function move(Vector3 $pos, $yaw = 0, $pitch = 0)
@ -1096,7 +1093,6 @@ class Entity extends Position
$this->yaw %= 360; $this->yaw %= 360;
$this->pitch += $pitch; $this->pitch += $pitch;
$this->pitch %= 90; $this->pitch %= 90;
$this->server->query("UPDATE entities SET x = " . $this->x . ", y = " . $this->y . ", z = " . $this->z . ", pitch = " . $this->pitch . ", yaw = " . $this->yaw . " WHERE EID = " . $this->eid . ";");
$this->updateAABB(); $this->updateAABB();
} }
@ -1110,14 +1106,12 @@ class Entity extends Position
public function updatePosition() public function updatePosition()
{ {
$this->server->query("UPDATE entities SET level = '" . $this->level->getName() . "', x = " . $this->x . ", y = " . $this->y . ", z = " . $this->z . ", pitch = " . $this->pitch . ", yaw = " . $this->yaw . " WHERE EID = " . $this->eid . ";");
$this->sendMoveUpdate(); $this->sendMoveUpdate();
$this->updateAABB(); $this->updateAABB();
} }
public function setPosition(Vector3 $pos, $yaw = false, $pitch = false) public function setPosition(Vector3 $pos, $yaw = false, $pitch = false)
{ {
$this->x = $pos->x; $this->x = $pos->x;
$this->y = $pos->y; $this->y = $pos->y;
$this->z = $pos->z; $this->z = $pos->z;
@ -1127,15 +1121,6 @@ class Entity extends Position
if($pitch !== false){ if($pitch !== false){
$this->pitch = $pitch; $this->pitch = $pitch;
} }
$this->server->preparedSQL->entity->setPosition->reset();
$this->server->preparedSQL->entity->setPosition->clear();
$this->server->preparedSQL->entity->setPosition->bindValue(":x", $this->x, SQLITE3_TEXT);
$this->server->preparedSQL->entity->setPosition->bindValue(":y", $this->y, SQLITE3_TEXT);
$this->server->preparedSQL->entity->setPosition->bindValue(":z", $this->z, SQLITE3_TEXT);
$this->server->preparedSQL->entity->setPosition->bindValue(":pitch", $this->pitch, SQLITE3_TEXT);
$this->server->preparedSQL->entity->setPosition->bindValue(":yaw", $this->yaw, SQLITE3_TEXT);
$this->server->preparedSQL->entity->setPosition->bindValue(":eid", $this->eid, SQLITE3_INTEGER);
$this->server->preparedSQL->entity->setPosition->execute();
} }
public function inBlockNonVector($x, $y, $z, $radius = 0.8) public function inBlockNonVector($x, $y, $z, $radius = 0.8)
{ {
@ -1371,7 +1356,6 @@ class Entity extends Position
"cause" => $cause "cause" => $cause
)) !== false or $force === true){ )) !== false or $force === true){
$this->health = min(127, max(- 127, $health)); $this->health = min(127, max(- 127, $health));
$this->server->query("UPDATE entities SET health = " . $this->health . " WHERE EID = " . $this->eid . ";");
if($harm === true){ if($harm === true){
$pk = new EntityEventPacket; $pk = new EntityEventPacket;
$pk->eid = $this->eid; $pk->eid = $this->eid;

View file

@ -1,5 +0,0 @@
<?php
//Useless Class(or not so usless =D?)
abstract class Hanging extends Entity implements Attachable{
const CLASS_TYPE = ENTITY_OBJECT;
}

View file

@ -1,5 +0,0 @@
<?php
class Human extends Creature{
const CLASS_TYPE = ENTITY_PLAYER;
}

View file

@ -1,6 +1,6 @@
<?php <?php
abstract class Living extends Entity implements Damageable, Pathfindable{ abstract class Living extends Entity implements Pathfindable{
public static $despawnMobs, $despawnTimer, $entityPushing = false; public static $despawnMobs, $despawnTimer, $entityPushing = false;

View file

@ -2,5 +2,4 @@
abstract class Projectile extends Entity{ abstract class Projectile extends Entity{
const CLASS_TYPE = ENTITY_OBJECT; const CLASS_TYPE = ENTITY_OBJECT;
} }

View file

@ -1,6 +1,7 @@
<?php <?php
class Painting extends Hanging{ class Painting extends Entity{
const CLASS_TYPE = ENTITY_OBJECT;
const TYPE = OBJECT_PAINTING; const TYPE = OBJECT_PAINTING;
public function __construct(Level $level, $eid, $class, $type = 0, $data = []){ public function __construct(Level $level, $eid, $class, $type = 0, $data = []){
parent::__construct($level, $eid, $class, $type, $data); parent::__construct($level, $eid, $class, $type, $data);

View file

@ -364,13 +364,17 @@ class Level{
if($e instanceof Entity){ if($e instanceof Entity){
$newChunkX = (int)$e->x >> 4; $newChunkX = (int)$e->x >> 4;
$newChunkZ = (int)$e->z >> 4; $newChunkZ = (int)$e->z >> 4;
if($curChunkX != $newChunkX || $curChunkZ != $newChunkZ){ if($e->level != $this && isset($this->entityListPositioned["$curChunkX $curChunkZ"])){
unset($this->entityListPositioned["$curChunkX $curChunkZ"][$e->eid]);
}else if($curChunkX != $newChunkX || $curChunkZ != $newChunkZ){
$index = "$curChunkX $curChunkZ"; //while creating index like $curChunkX << 32 | $curChunkZ is faster, placing it inside list is slow $index = "$curChunkX $curChunkZ"; //while creating index like $curChunkX << 32 | $curChunkZ is faster, placing it inside list is slow
$newIndex = "$newChunkX $newChunkZ"; $newIndex = "$newChunkX $newChunkZ";
unset($this->entityListPositioned[$index][$e->eid]); unset($this->entityListPositioned[$index][$e->eid]);
$this->entityListPositioned[$newIndex][$e->eid] = $e->eid; //set to e->eid to avoid possible memory leaks $this->entityListPositioned[$newIndex][$e->eid] = $e->eid; //set to e->eid to avoid possible memory leaks
} }
} }else if(isset($this->entityListPositioned["$curChunkX $curChunkZ"])){
unset($this->entityListPositioned["$curChunkX $curChunkZ"][$k]);
}
} }
$this->checkSleep(); $this->checkSleep();
@ -405,22 +409,23 @@ class Level{
$this->queuedBlockUpdates = []; $this->queuedBlockUpdates = [];
} }
public function getEntitiesNearby(Entity $e, $radius = 5){ public function getEntitiesInAABB(AxisAlignedBB $bb){
$minChunkX = ((int)($e->x - $radius)) >> 4; $minChunkX = ((int)($bb->minX)) >> 4;
$minChunkZ = ((int)($e->z - $radius)) >> 4; $minChunkZ = ((int)($bb->minZ)) >> 4;
$maxChunkX = ((int)($e->x + $radius)) >> 4; $maxChunkX = ((int)($bb->maxX)) >> 4;
$maxChunkZ = ((int)($e->z + $radius)) >> 4; $maxChunkZ = ((int)($bb->maxZ)) >> 4;
$ents = []; $ents = [];
//TODO also index by chunkY? //TODO also index by chunkY?
for($chunkX = $minChunkX; $chunkX <= $maxChunkX; ++$chunkX){ for($chunkX = $minChunkX; $chunkX <= $maxChunkX; ++$chunkX){
for($chunkZ = $minChunkZ; $chunkZ <= $maxChunkZ; ++$chunkZ){ for($chunkZ = $minChunkZ; $chunkZ <= $maxChunkZ; ++$chunkZ){
$ind = "$chunkX $chunkZ"; $ind = "$chunkX $chunkZ";
foreach($this->entityListPositioned[$ind] ?? [] as $entid){ foreach($this->level->entityListPositioned[$ind] ?? [] as $entid){
$ents[$entid] = $this->entityList[$entid]; if($this->entityList[$entid] instanceof Entity && $this->entityList[$entid]->boundingBox->intersectsWith($bb)){
$ents[$entid] = $this->entityList[$entid];
}
} }
} }
} }
unset($ents[$e->eid]);
return $ents; return $ents;
} }