fix for PR
# Conflicts: # src/authserver/Server/AuthSocket.cpp # src/game/AI/SmartScripts/SmartScript.cpp # src/game/DungeonFinding/LFGMgr.cpp # src/game/Entities/Player/Player.cpp # src/game/Entities/Unit/Unit.cpp # src/game/Entities/Vehicle/Vehicle.cpp # src/game/Guilds/Guild.cpp # src/game/Handlers/ChannelHandler.cpp # src/game/Handlers/GuildHandler.cpp # src/game/Handlers/LFGHandler.cpp # src/game/Handlers/LootHandler.cpp # src/game/Handlers/MiscHandler.cpp # src/game/Handlers/PetitionsHandler.cpp # src/game/Handlers/QueryHandler.cpp # src/game/Movement/MotionMaster.cpp # src/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp # src/game/Server/WorldSocket.cpp # src/game/Spells/Auras/SpellAuraEffects.cpp # src/game/Spells/SpellEffects.cpp # src/scripts/Commands/cs_modify.cpp
This commit is contained in:
@@ -310,8 +310,9 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId)
|
||||
if (_status == STATUS_UNINSTALLING)
|
||||
{
|
||||
#ifdef ENABLE_EXTRAS && ENABLE_EXTRA_LOGS
|
||||
sLog->outError(LOG_FILTER_VEHICLES, "Passenger GuidLow: %u, Entry: %u, attempting to board vehicle GuidLow: %u, Entry: %u during uninstall! SeatId: %i", unit->GetGUIDLow(), unit->GetEntry(), _me->GetGUIDLow(), _me->GetEntry(), (int32)seatId);
|
||||
#endif return false;
|
||||
sLog->outDebug(LOG_FILTER_VEHICLES, "Passenger GuidLow: %u, Entry: %u, attempting to board vehicle GuidLow: %u, Entry: %u during uninstall! SeatId: %i", unit->GetGUIDLow(), unit->GetEntry(), _me->GetGUIDLow(), _me->GetEntry(), (int32)seatId);
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
if (unit->GetVehicle() != this)
|
||||
|
||||
Reference in New Issue
Block a user