From 646dddc5897480b7b446e27ed42d45f734abfca6 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 11 May 2021 10:23:41 +0800
Subject: [PATCH] 1

---
 server/gameserver/creature.cc     | 6 ++++--
 server/gameserver/roomobstacle.cc | 5 +++++
 server/gameserver/roomobstacle.h  | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 9169421..305f93a 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -1654,7 +1654,8 @@ void Creature::RemoveSurplusHero(int buff_id, int id, int num)
             }
         }
         while (matched_heros.size() >= num) {
-            break;
+            matched_heros[0]->DetachFromMaster();
+            matched_heros.erase(matched_heros.begin());
         }
     }
 }
@@ -1670,7 +1671,8 @@ void Creature::RemoveSurplusObstacle(int buff_id, int id, int num)
             }
         }
         while (matched_things.size() >= num) {
-            break;
+            matched_things[0]->DetachFromMaster();
+            matched_things.erase(matched_things.begin());
         }
     }
 }
diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc
index ea4b78b..eaf5ffb 100644
--- a/server/gameserver/roomobstacle.cc
+++ b/server/gameserver/roomobstacle.cc
@@ -434,3 +434,8 @@ void RoomObstacle::ActivePosionGas()
          &xtimer_attacher.timer_list_
          );
 }
+
+void RoomObstacle::DetachFromMaster()
+{
+
+}
diff --git a/server/gameserver/roomobstacle.h b/server/gameserver/roomobstacle.h
index 78600cd..4acf2eb 100644
--- a/server/gameserver/roomobstacle.h
+++ b/server/gameserver/roomobstacle.h
@@ -21,6 +21,7 @@ class RoomObstacle : public Obstacle
     void ActiveTimerFunc();
     void UpdateTimerFunc();
     void Active();
+    void DetachFromMaster();
 
 private:
     void Explosion();