diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc index 1a28bcd0..f7b16c89 100644 --- a/server/gameserver/android.cc +++ b/server/gameserver/android.cc @@ -118,7 +118,7 @@ void Android::InternalUpdate(int delta_time) } } #ifdef DEBUG - if (!Global::Instance()->stop_world) { + if (!room->stop_world) { agent_->Exec(); } #else diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 11d56e11..aad3ead7 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -1075,9 +1075,9 @@ void Player::_CMExecCommand(f8::MsgHdr& hdr, const cs::CMExecCommand& msg) TEXT("battle_server_killer_gas", "毒圈"), dmg_out); } else if (cmd == "stop_world") { - Global::Instance()->stop_world = true; + room->stop_world = true; } else if (cmd == "start_world") { - Global::Instance()->stop_world = false; + room->stop_world = false; } else if (cmd == "add_hp") { if (cmds.size() > 1) { float hp = a8::XValue(cmds[1]).GetDouble(); diff --git a/server/gameserver/room.h b/server/gameserver/room.h index 41e631d3..0ca4b153 100644 --- a/server/gameserver/room.h +++ b/server/gameserver/room.h @@ -70,6 +70,7 @@ public: const mt::PveGemini* pve_instance = nullptr; int pve_human_num = 0; PveData pve_data; + bool stop_world = false; ~Room(); void InitData(RoomInitInfo& init_info);