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

1

Browse Source
This commit is contained in:
aozhiwei 2021-10-22 15:06:19 +08:00
parent 9ec6455b7c
commit 87750e34e7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/buff.cc
View File

@ -808,7 +808,8 @@ void Buff::ProcInWater()
return; return;
} }
Human* hum = buff->owner->AsHuman(); Human* hum = buff->owner->AsHuman();
if (hum->GetOxygen() < MetaMgr::Instance()->dive_oxygen_total) { if (!hum->HasBuffEffect(kBET_Dive) &&
hum->GetOxygen() < MetaMgr::Instance()->dive_oxygen_total) {
hum->AddOxygen(MetaMgr::Instance()->inwater_oxygen_recover); hum->AddOxygen(MetaMgr::Instance()->inwater_oxygen_recover);
hum->room->frame_event.AddPropChg(hum->GetWeakPtrRef(), hum->room->frame_event.AddPropChg(hum->GetWeakPtrRef(),
kPropDive, kPropDive,

4
server/gameserver/human.cc
View File

@ -3835,6 +3835,10 @@ void Human::DoDive()
if (HasBuffEffect(kBET_Dive)) { if (HasBuffEffect(kBET_Dive)) {
return; return;
} }
if (HasBuffEffect(kBET_Driver) ||
HasBuffEffect(kBET_Passenger)) {
return;
}
if (HasBuffEffect(kBET_Camouflage) ) { if (HasBuffEffect(kBET_Camouflage) ) {
RemoveBuffByEffectId(kBET_Camouflage); RemoveBuffByEffectId(kBET_Camouflage);
} }