Merge remote-tracking branch 'upstream/main' into ub-fixes

This commit is contained in:
jadebenn
2024-11-27 20:51:24 -06:00
18 changed files with 320 additions and 282 deletions

View File

@@ -12,7 +12,10 @@ void BaseFootRaceManager::OnFireEventServerSide(Entity* self, Entity* sender, st
if (splitArguments.size() > 1) {
const auto eventName = splitArguments[0];
const auto player = Game::entityManager->GetEntity(std::stoull(splitArguments[1]));
auto playerId = GeneralUtils::TryParse<LWOOBJID>(splitArguments[1]);
if (!playerId) return;
const auto player = Game::entityManager->GetEntity(playerId.value());
if (player != nullptr) {
if (eventName == "updatePlayer") {