From 9c53b21fa11cae09ca2e1e079c37162f8841d1a5 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 23 Jun 2021 07:19:41 +0000
Subject: [PATCH] 1

---
 server/gameserver/frameevent.cc   | 13 -------------
 server/gameserver/framemaker.cc   | 10 ----------
 server/gameserver/room.cc         |  7 +++++--
 server/gameserver/roomobstacle.cc |  2 --
 4 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/server/gameserver/frameevent.cc b/server/gameserver/frameevent.cc
index 1241073..1353c34 100644
--- a/server/gameserver/frameevent.cc
+++ b/server/gameserver/frameevent.cc
@@ -120,19 +120,6 @@ void FrameEvent::AddExplosionEx(CreatureWeakPtr& sender, int item_id, a8::Vec2 b
     if (!sender.Get()) {
         return;
     }
-    #endif
-    #if 1
-    Player* hum = room->GetOneAlivePlayer();
-    sender.Attach((Creature*)hum);
-    item_id = 66001;
-#ifdef DEBUG
-    a8::XPrintf("AddExplosion pos=%d,%d effect:%d\n",
-                {
-                 bomb_pos.x,
-                 bomb_pos.y,
-                 effect
-                });
-#endif
     #endif
     {
         auto& tuple = a8::FastAppend(explosions_);
diff --git a/server/gameserver/framemaker.cc b/server/gameserver/framemaker.cc
index 79a7983..2b438fd 100644
--- a/server/gameserver/framemaker.cc
+++ b/server/gameserver/framemaker.cc
@@ -118,16 +118,6 @@ cs::SMUpdate* FrameMaker::MakeUpdateMsg(Human* hum)
             if (idx < room->frame_event.explosions_.size()) {
                 auto& tuple = room->frame_event.explosions_[idx];
                 *msg->add_explosions() = std::get<1>(tuple);
-#ifdef DEBUG
-                a8::XPrintf("AddExplosion %d, %s pos=%d,%d effect:%d\n",
-                            {
-                             hum->GetUniId(),
-                             hum->name,
-                             std::get<1>(tuple).pos().x(),
-                             std::get<1>(tuple).pos().y(),
-                             std::get<1>(tuple).effect()
-                            });
-#endif
             }
         }
         for (size_t idx : hum->smokes_) {
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index f20d0b0..ea4a9d8 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -3931,7 +3931,6 @@ void Room::AirRaid(int airraid_id)
     a8::Vec2 dir = a8::Vec2::UP;
     dir.Rotate(a8::RandAngle());
     a8::Vec2 center = gas_data_.pos_new + dir * (100 + rand() % gas_data_.new_area_meta->i->rad());
-    #if 1
     {
         std::vector<Player*> humans;
         GetAlivePlayers(humans, GetRoomMaxPlayerNum());
@@ -3944,8 +3943,12 @@ void Room::AirRaid(int airraid_id)
                 }
             }
         }
+        #if 1
+        if (humans.size() > 0) {
+            center = humans[0]->GetPos();
+        }
+        #endif
     }
-    #endif
     frame_event.AddAirRaid(raid_meta->i->appear_time(), center, raid_meta->i->rad());
 
     auto raid_cb =
diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc
index f4b8cb8..af8a9ec 100644
--- a/server/gameserver/roomobstacle.cc
+++ b/server/gameserver/roomobstacle.cc
@@ -183,7 +183,6 @@ void RoomObstacle::SpecExplosion()
         bomb_born_offset.Rotate(a8::RandAngle());
         bomb_born_offset = bomb_born_offset * a8::RandEx(1, std::max(2, meta->i->explosion_float()));
         a8::Vec2 bomb_pos = GetPos() + bomb_born_offset;
-        #if 0
         Explosion explosion;
         explosion.IndifferenceAttack(
                                      room,
@@ -192,7 +191,6 @@ void RoomObstacle::SpecExplosion()
                                      meta->i->explosion_effect(),
                                      meta->i->damage()
                                      );
-        #endif
     }
     if (explosion_times_ >= meta->i->explosion_times()) {
         room->xtimer.DeleteTimer(room->xtimer.GetRunningTimer());