From 19fb97b19a704bb5093e7170ea58a5327f60c7a0 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 7 Sep 2021 03:20:30 +0000 Subject: [PATCH] 1 --- server/gameserver/creature.cc | 4 ++-- server/gameserver/room.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 9b84f86..420e1b0 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -2779,14 +2779,14 @@ bool Creature::CanFollow(Creature* follower) return false; } #endif - if (!follower->HasBuffEffect(kBET_Jump)) { + if (!follower->HasBuffEffect(kBET_Jump) && room->GetGasData().gas_mode != GasInactive) { return false; } if (!IsPlayer()) { return false; } - if (!HasBuffEffect(kBET_Jump)) { + if (!HasBuffEffect(kBET_Jump) && room->GetGasData().gas_mode != GasInactive) { return false; } return true; diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 51b4a1b..8282918 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -2278,7 +2278,7 @@ long long Room::GetGasInactiveTime() { #ifdef DEBUG 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 { if (room_type_ == RT_NewBrid) {