1
This commit is contained in:
parent
d807207da0
commit
19fb97b19a
@ -2779,14 +2779,14 @@ bool Creature::CanFollow(Creature* follower)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (!follower->HasBuffEffect(kBET_Jump)) {
|
if (!follower->HasBuffEffect(kBET_Jump) && room->GetGasData().gas_mode != GasInactive) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!IsPlayer()) {
|
if (!IsPlayer()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (!HasBuffEffect(kBET_Jump)) {
|
if (!HasBuffEffect(kBET_Jump) && room->GetGasData().gas_mode != GasInactive) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -2278,7 +2278,7 @@ long long Room::GetGasInactiveTime()
|
|||||||
{
|
{
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
return App::Instance()->debug_params.find(1) != App::Instance()->debug_params.end() ?
|
return App::Instance()->debug_params.find(1) != App::Instance()->debug_params.end() ?
|
||||||
App::Instance()->debug_params[1] : 10;
|
App::Instance()->debug_params[1] : 20;
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
if (room_type_ == RT_NewBrid) {
|
if (room_type_ == RT_NewBrid) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user