diff --git a/server/gameserver/android_new.ai.cc b/server/gameserver/android_new.ai.cc index a0cf9db..f829af3 100644 --- a/server/gameserver/android_new.ai.cc +++ b/server/gameserver/android_new.ai.cc @@ -41,6 +41,26 @@ void AndroidNewAI::Update(int delta_time) if (hum->dead) { return; } + #if 1 + { + if (a8::HasBitFlag(hum->status, HS_NewBieGuideAndroid)) { + UpdateNewBieNpc(); + return; + } + if (a8::HasBitFlag(hum->status, HS_LastAndroid)) { + UpdateLastNpc(); + return; + } + if ((hum->room->GetRoomType() == RT_NewBrid || + hum->room->GetRoomType() == RT_MidBrid) && + hum->room->GetGasData().gas_mode != GasInactive && + hum->team_uuid.empty() + ) { + UpdateNewBieRoomLogic(); + return; + } + } + #endif switch (GetAiLevel()) { case 1: { @@ -88,22 +108,6 @@ void AndroidNewAI::Update(int delta_time) void AndroidNewAI::DefaultAi() { Human* hum = (Human*)owner; - if (a8::HasBitFlag(hum->status, HS_NewBieGuideAndroid)) { - UpdateNewBieNpc(); - return; - } - if (a8::HasBitFlag(hum->status, HS_LastAndroid)) { - UpdateLastNpc(); - return; - } - if ((hum->room->GetRoomType() == RT_NewBrid || - hum->room->GetRoomType() == RT_MidBrid) && - hum->room->GetGasData().gas_mode != GasInactive && - hum->team_uuid.empty() - ) { - UpdateNewBieRoomLogic(); - return; - } switch (old_ai_data_.state) { case AS_thinking: {