diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index 6c506129..3ba2af83 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -316,9 +316,8 @@ void Bullet::ProcBomb() } break; } - room->RemoveObjectLater(this); - later_removed_ = true; self_collider_->rad = old_collider_rad; + ForceRemove(); } void Bullet::ProcSmokeBomb() @@ -401,8 +400,7 @@ void Bullet::MapServiceUpdate() } else { Check(distance); if (!later_removed_) { - room->RemoveObjectLater(this); - later_removed_ = true; + ForceRemove(); } } } else { @@ -432,8 +430,7 @@ void Bullet::MapServiceUpdate() } #endif } else { - room->RemoveObjectLater(this); - later_removed_ = true; + ForceRemove(); } } @@ -626,9 +623,7 @@ void Bullet::Check(float distance) ); } } - ClearBuffList(); - room->RemoveObjectLater(this); - later_removed_ = true; + ForceRemove(); } } }