Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 00:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

DB: Fixed startup errors and formatting

Browse Source 
Core/Vehicles: Prevent "unprocessed tail data" vehicle packet spam
This commit is contained in:
Shauren
2011-02-26 12:53:17 +01:00
parent 7e4456f79d
commit 45f91feaa8
4 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/updates/world/2011_02_25_0_world_creatures.sql
View File

@@ -5,4 +5,4 @@ UPDATE `creature_model_info` SET `bounding_radius`=0.31, `combat_reach`=25 WHERE
DELETE FROM `creature` WHERE `id` IN(32933,32934);
-- Update spawn data
UPDATE `creature` SET `unit_flags`=33554432, `deathstate`= 1, `MovementType`=0 WHERE `id`=34297;
UPDATE `creature` SET `unit_flags`=33554432, `deathstate`= 1, `MovementType`=0 WHERE `id`=34297;

3
sql/updates/world/2011_02_25_1_world_spell_script_names.sql
View File

@@ -1,2 +1,3 @@
DELETE FROM `spell_script_names` WHERE `spell_id`=64702;
INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES (64702, 'spell_ulduar_squeezed_lifeless');
INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
(64702, 'spell_ulduar_squeezed_lifeless');

2
sql/updates/world/2011_02_26_3_world_creatures.sql Normal file
View File

@@ -0,0 +1,2 @@
UPDATE `creature` SET `spawndist`=0 WHERE `guid`=137582;
DELETE FROM `creature_addon` WHERE `guid` IN (136768,136769);

40
src/server/game/Server/Protocol/Handlers/VehicleHandler.cpp
View File

@@ -29,9 +29,9 @@ void WorldSession::HandleDismissControlledVehicle(WorldPacket &recv_data)
uint64 vehicleGUID = _player->GetCharmGUID();
if (!vehicleGUID) // something wrong here...
if (!vehicleGUID) // something wrong here...
{
recv_data.rpos(recv_data.wpos()); // prevent warnings spam
recv_data.rfinish(); // prevent warnings spam
return;
}
@@ -55,11 +55,15 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
Unit* vehicle_base = GetPlayer()->GetVehicleBase();
if (!vehicle_base)
{
recv_data.rfinish(); // prevent warnings spam
return;
}
VehicleSeatEntry const* seat = GetPlayer()->GetVehicle()->GetSeatForPassenger(GetPlayer());
if (!seat->CanSwitchFromSeat())
{
recv_data.rfinish(); // prevent warnings spam
sLog->outError("HandleChangeSeatsOnControlledVehicle, Opcode: %u, Player %u tried to switch seats but current seatflags %u don't permit that.",
recv_data.GetOpcode(), GetPlayer()->GetGUIDLow(), seat->m_flags);
return;
@@ -67,13 +71,13 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
switch (recv_data.GetOpcode())
{
case CMSG_REQUEST_VEHICLE_PREV_SEAT:
GetPlayer()->ChangeSeat(-1, false);
break;
case CMSG_REQUEST_VEHICLE_NEXT_SEAT:
GetPlayer()->ChangeSeat(-1, true);
break;
case CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE:
case CMSG_REQUEST_VEHICLE_PREV_SEAT:
GetPlayer()->ChangeSeat(-1, false);
break;
case CMSG_REQUEST_VEHICLE_NEXT_SEAT:
GetPlayer()->ChangeSeat(-1, true);
break;
case CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE:
{
uint64 guid; // current vehicle guid
recv_data.readPackGUID(guid);
@@ -97,9 +101,9 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
if (vehicle->HasEmptySeat(seatId))
GetPlayer()->EnterVehicle(vehicle, seatId);
}
break;
}
break;
case CMSG_REQUEST_VEHICLE_SWITCH_SEAT:
case CMSG_REQUEST_VEHICLE_SWITCH_SEAT:
{
uint64 guid; // current vehicle guid
recv_data.readPackGUID(guid);
@@ -113,10 +117,10 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
if (Vehicle *vehicle = vehUnit->GetVehicleKit())
if (vehicle->HasEmptySeat(seatId))
GetPlayer()->EnterVehicle(vehicle, seatId);
break;
}
break;
default:
break;
default:
break;
}
}
@@ -126,14 +130,15 @@ void WorldSession::HandleEnterPlayerVehicle(WorldPacket &data)
uint64 guid;
data >> guid;
if (Player* pl=ObjectAccessor::FindPlayer(guid))
if (Player* pl = ObjectAccessor::FindPlayer(guid))
{
if (!pl->GetVehicleKit())
return;
if (!pl->IsInRaidWith(_player))
return;
if (!pl->IsWithinDistInMap(_player,INTERACTION_DISTANCE))
if (!pl->IsWithinDistInMap(_player, INTERACTION_DISTANCE))
return;
_player->EnterVehicle(pl);
}
}
@@ -143,6 +148,7 @@ void WorldSession::HandleEjectPassenger(WorldPacket &data)
Vehicle* vehicle = _player->GetVehicleKit();
if (!vehicle)
{
recv_data.rfinish(); // prevent warnings spam
sLog->outError("HandleEjectPassenger: Player %u is not in a vehicle!", GetPlayer()->GetGUIDLow());
return;
}
@@ -219,4 +225,4 @@ void WorldSession::HandleRequestVehicleExit(WorldPacket &recv_data)
GetPlayer()->GetGUIDLow(), seat->m_ID, seat->m_flags);
}
}
}
}