From 0b52277eebfcce33dfaa596b7e9ebab28b009662 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 4 Jan 2023 19:30:30 +0800 Subject: [PATCH] 1 --- server/gameserver/creature.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 587c75d0..87987f84 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -2597,23 +2597,14 @@ void Creature::AutoNavigation(Position target_pos, float speed, move_distance }); #endif - bool ok = false; - // 999 - #if 0 - if (c->CheckCollision()) { - c->SetPos(old_pos); - ok = true; - } else { - ok = std::abs(move_distance - context->distance) < 0.0001f; - room->grid_service->MoveCreature(c); - } + bool ok = std::abs(move_distance - context->distance) < 0.0001f; + room->grid_service->MoveCreature(c); if (ok || c->dead) { context->cb(c); c->DecDisableMoveTimes(); room->xtimer.DeleteCurrentTimer(); } - #endif } }, &xtimer_attacher);