diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index ddb4edd..4bc06bb 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -246,7 +246,6 @@ void Bullet::MapServiceUpdate() if (IsBomb()) { ProcBomb(); } else { - deleted = true; if (!objects.empty()) { OnHit(objects); } diff --git a/server/gameserver/entity.h b/server/gameserver/entity.h index ea3830a..261070f 100644 --- a/server/gameserver/entity.h +++ b/server/gameserver/entity.h @@ -20,9 +20,7 @@ class Entity int entity_uniid = 0; EntityType_e entity_type = ET_None; EntitySubType_e entity_subtype = EST_None; - long long create_frameno = 0; int updated_times = 0; - bool deleted = false; bool is_permanent = false; MapService* permanent_map_service = nullptr; @@ -40,7 +38,7 @@ class Entity virtual float GetSpeed() { return 1.0f;}; virtual void GetAabbBox(AabbCollider& aabb_box); virtual void GetCircleBox(CircleCollider& circle_box); - virtual bool IsDead(Room* room) {}; + virtual bool IsDead(Room* room) { return false;}; virtual long long GetDeadFrameNo(Room* room) { return 0;}; virtual void OnPreCollision(Room* room) {}; bool TestCollision(Room* room, Entity* b);