From 48157321dba1c8eb738cb3249fb4e2f96783bd2a Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 13 Mar 2023 13:16:19 +0800 Subject: [PATCH] 1 --- server/gameserver/car.cc | 6 ++++++ server/gameserver/room.cc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/server/gameserver/car.cc b/server/gameserver/car.cc index 309bae2b..e5a2909e 100644 --- a/server/gameserver/car.cc +++ b/server/gameserver/car.cc @@ -107,7 +107,9 @@ void Car::GetDown(Human* passenger) passenger->CancelAction(); passenger->RemoveBuffByEffectId(kBET_Driver); passenger->RemoveBuffByEffectId(kBET_Passenger); + Global::Instance()->verify_set_pos = 1; passenger->SetPos(passenger->GetPos()); + Global::Instance()->verify_set_pos = 0; room->frame_event.AddCarChg(passenger->GetWeakPtrRef()); if (passengers_.empty()) { team_id = 0; @@ -160,7 +162,9 @@ void Car::GetOn(Human* passenger) } passenger->SetCar(this); passenger->SetSeat(seat); + Global::Instance()->verify_set_pos = 1; passenger->SetPos(GetPos()); + Global::Instance()->verify_set_pos = 0; { const mt::Buff* buff_meta = mt::Buff::GetById (driver_ == passenger ? DRIVER_BUFFID : PASSENGER_BUFFID); @@ -250,7 +254,9 @@ int Car::AllocSeat() void Car::SyncPos() { if (driver_) { + Global::Instance()->verify_set_pos = 1; SetPos(driver_->GetPos()); + Global::Instance()->verify_set_pos = 0; SetMoveDir(driver_->GetMoveDir()); for (auto hum : passengers_) { if (hum != driver_) { diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index edf5abf7..f6ad5c7f 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -3741,7 +3741,7 @@ void Room::CreateWorldObjects() ); #if 1 { - const mt::Equip* equip_meta = mt::Equip::GetById(30501); + const mt::Equip* equip_meta = mt::Equip::GetById(30502); if (equip_meta) { int car_uniid = AllocUniid(); Car* c = CreateCar(nullptr,