server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-03-24 18:30:02 +08:00
parent 90b3684bf8
commit 9616288511
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/gameserver/creature.cc
View File

@ -2888,10 +2888,11 @@ void Creature::RemoveSkillObstacle(const mt::Skill* skill_meta)
} }
} }
if (skill_meta && skill_meta->GetMagicId() == MAGIC_20301_XL) { if (skill_meta && skill_meta->GetMagicId() == MAGIC_20301_XL) {
int save_num = skill_meta->_number_meta->number(); int save_num = skill_meta->_number_meta->number() * 2 - 2;
while (del_obs.size() > save_num) { if (del_obs.size() > save_num & save_num > 0) {
del_obs[0].Get()->Destory(); for (int i = 0; i < del_obs.size() - save_num; ++i) {
del_obs.erase(del_obs.begin()); del_obs[i].Get()->Destory();
}
} }
} else { } else {
for (auto ob : del_obs) { for (auto ob : del_obs) {

2
server/gameserver/roomobstacle.cc
View File

@ -882,10 +882,10 @@ void RoomObstacle::ActiveMedicalStation()
} }
}//end if }//end if
if (hit) { if (hit) {
RemoveSameSkillObstacle();
} }
}, },
&xtimer_attacher); &xtimer_attacher);
RemoveSameSkillObstacle();
} }
void RoomObstacle::ForceGridList() void RoomObstacle::ForceGridList()

2
server/gameserver/weakptr.cc
View File

@ -183,7 +183,7 @@ RoomObstacleWeakPtr&& RoomObstacleWeakPtr::operator=(RoomObstacleWeakPtr&& x)
x.Detach(); x.Detach();
} }
A8_ABORT(); A8_ABORT();
// return *this; //return *this;
} }
RoomObstacleWeakPtr::~RoomObstacleWeakPtr() RoomObstacleWeakPtr::~RoomObstacleWeakPtr()