add ENTITY_NONE, ENTITY_AUTO reserved entity id & update player.set_entity(...)

This commit is contained in:
MihailRis
2025-01-21 05:56:14 +03:00
parent f2101f6504
commit 23c66654a2
4 changed files with 7 additions and 4 deletions
+2 -2
View File
@@ -62,7 +62,7 @@ Player::Player(
Player::~Player() = default;
void Player::updateEntity() {
if (eid == 0) {
if (eid == ENTITY_AUTO) {
auto& def = level.content.entities.require("base:player");
eid = level.entities->spawn(def, getPosition());
if (auto entity = level.entities->get(eid)) {
@@ -73,7 +73,7 @@ void Player::updateEntity() {
if (auto entity = level.entities->get(eid)) {
entity->setPlayer(id);
}
} else if (chunks->getChunkByVoxel(position)) {
} else if (chunks->getChunkByVoxel(position) && eid != ENTITY_NONE) {
logger.error() << "player entity despawned or deleted; "
"will be respawned";
eid = 0;
+1 -1
View File
@@ -54,7 +54,7 @@ class Player : public Serializable {
bool infiniteItems = true;
bool instantDestruction = true;
bool loadingChunks = true;
entityid_t eid;
entityid_t eid = ENTITY_AUTO;
entityid_t selectedEid = 0;
glm::vec3 rotation {};