1
This commit is contained in:
parent
51f7d3eefa
commit
a2747025f5
@ -88,6 +88,13 @@ void Car::GetDown(Human* passenger)
|
|||||||
passenger->RecalcSelfCollider();
|
passenger->RecalcSelfCollider();
|
||||||
}
|
}
|
||||||
passengers_.erase(passenger);
|
passengers_.erase(passenger);
|
||||||
|
passenger->SetCar(nullptr);
|
||||||
|
passenger->SetSeat(0);
|
||||||
|
passenger->second_weapon = Weapon();
|
||||||
|
passenger->CancelAction();
|
||||||
|
passenger->RemoveBuffByEffectId(kBET_Driver);
|
||||||
|
passenger->RemoveBuffByEffectId(kBET_Passenger);
|
||||||
|
room->frame_event.AddCarChg(passenger);
|
||||||
if (passengers_.empty()) {
|
if (passengers_.empty()) {
|
||||||
int loot_uniid = room->CreateLoot(meta->i->id(), GetPos(), 1, 1);
|
int loot_uniid = room->CreateLoot(meta->i->id(), GetPos(), 1, 1);
|
||||||
Entity* loot_entity = room->GetEntityByUniId(loot_uniid);
|
Entity* loot_entity = room->GetEntityByUniId(loot_uniid);
|
||||||
@ -100,17 +107,14 @@ void Car::GetDown(Human* passenger)
|
|||||||
loot_entity->GetPos());
|
loot_entity->GetPos());
|
||||||
}
|
}
|
||||||
room->TakeOffCarObject(loot_uniid, GetPos());
|
room->TakeOffCarObject(loot_uniid, GetPos());
|
||||||
|
BroadcastDeleteState(room);
|
||||||
|
RemoveFromAroundPlayers(room);
|
||||||
|
room->grid_service->RemoveCreature(this);
|
||||||
room->RemoveObjectLater(this);
|
room->RemoveObjectLater(this);
|
||||||
later_removed_ = true;
|
later_removed_ = true;
|
||||||
|
} else {
|
||||||
|
SyncAroundPlayers(__FILE__, __LINE__, __func__);
|
||||||
}
|
}
|
||||||
passenger->SetCar(nullptr);
|
|
||||||
passenger->SetSeat(0);
|
|
||||||
passenger->second_weapon = Weapon();
|
|
||||||
passenger->CancelAction();
|
|
||||||
passenger->RemoveBuffByEffectId(kBET_Driver);
|
|
||||||
passenger->RemoveBuffByEffectId(kBET_Passenger);
|
|
||||||
room->frame_event.AddCarChg(passenger);
|
|
||||||
SyncAroundPlayers(__FILE__, __LINE__, __func__);
|
|
||||||
room->NotifyUiUpdate();
|
room->NotifyUiUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user