1

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());
         }
     }
 }

server/gameserver/roomobstacle.cc

@@ -434,3 +434,8 @@ void RoomObstacle::ActivePosionGas()
          &xtimer_attacher.timer_list_
          );
 }
+
+void RoomObstacle::DetachFromMaster()
+{
+
+}

server/gameserver/roomobstacle.h

@@ -21,6 +21,7 @@ class RoomObstacle : public Obstacle
     void ActiveTimerFunc();
     void UpdateTimerFunc();
     void Active();
+    void DetachFromMaster();
 
 private:
     void Explosion();