From beffffff3014b927f24f2c100082993c70548b18 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 31 Aug 2021 16:23:34 +0800
Subject: [PATCH] 1

---
 server/gameserver/obstacle.cc    | 3 +--
 server/gameserver/obstacle.h     | 1 -
 server/gameserver/room.h         | 1 -
 server/gameserver/roomobstacle.h | 2 --
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/server/gameserver/obstacle.cc b/server/gameserver/obstacle.cc
index 826d6e2..97c15b4 100644
--- a/server/gameserver/obstacle.cc
+++ b/server/gameserver/obstacle.cc
@@ -476,8 +476,7 @@ void Obstacle::OnBulletHit(Bullet* bullet)
         return;
     }
 
-    if (!IsDead(bullet->room) &&
-        !IsTerminatorAirDropBox(bullet->room)) {
+    if (!IsDead(bullet->room)) {
         if (meta->receive_special_damage_type != 0 &&
             ((bullet->gun_meta->special_damage_type & meta->receive_special_damage_type) == 0)) {
             return;
diff --git a/server/gameserver/obstacle.h b/server/gameserver/obstacle.h
index b29bb9d..08dbacf 100644
--- a/server/gameserver/obstacle.h
+++ b/server/gameserver/obstacle.h
@@ -45,7 +45,6 @@ class Obstacle : public Entity
     virtual void OnBulletHit(Bullet* bullet) override;
     virtual void OnExplosionHit(Explosion* explosion) override;
     virtual bool Attackable(Room* room) override;
-    virtual bool IsTerminatorAirDropBox(Room* room) { return false; }
     virtual bool CanThroughable(Creature* c);
     virtual bool CanThroughable(Bullet* bullet);
     virtual bool DoInteraction(Human* sender);
diff --git a/server/gameserver/room.h b/server/gameserver/room.h
index 00d9656..02e7112 100644
--- a/server/gameserver/room.h
+++ b/server/gameserver/room.h
@@ -350,7 +350,6 @@ private:
     int creator_channel_ = 0;
     bool force_entry_newbie_room_ = false;
     xtimer_list* battle_report_timer_ = nullptr;
-    bool sent_terminator_airdrop = false;
 
     int current_teamid_ = 0;
     int current_uniid_ = FIXED_OBJECT_MAXID;
diff --git a/server/gameserver/roomobstacle.h b/server/gameserver/roomobstacle.h
index 1b5e7e4..8442ee4 100644
--- a/server/gameserver/roomobstacle.h
+++ b/server/gameserver/roomobstacle.h
@@ -12,7 +12,6 @@ class RoomObstacle : public Obstacle
     Room* room = nullptr;
     a8::XTimerAttacher xtimer_attacher;
     bool is_treasure_box = false;
-    bool is_terminator_airdrop_box = false;
     CreatureWeakPtr master;
     int real_object_uniid = 0;
     std::shared_ptr<Ability> context_ability;
@@ -21,7 +20,6 @@ class RoomObstacle : public Obstacle
     virtual ~RoomObstacle() override;
     virtual void Initialize() override;
     virtual void RecalcSelfCollider() override;
-    virtual bool IsTerminatorAirDropBox(Room* room) override { return is_terminator_airdrop_box; }
     virtual bool DoInteraction(Human* sender) override;
     virtual void OnBattleStart(Room* room) override;
     void ActiveTimerFunc();