Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Misc: Various crash fixes

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/4f65dc5e20cc3af5b3595809707c632faa6e5900)
This commit is contained in:
hondacrx
2019-08-17 11:23:32 -04:00
parent a44224564c
commit 2d2a72ce3e
13 changed files with 65 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Handlers/InspectHandler.cs
+2 -2
View File
@@ -29,7 +29,7 @@ namespace Game
[WorldPacketHandler(ClientOpcodes.Inspect)]
void HandleInspect(Inspect inspect)
{
Player player = Global.ObjAccessor.FindPlayer(inspect.Target);
Player player = Global.ObjAccessor.GetPlayer(_player, inspect.Target);
if (!player)
{
Log.outDebug(LogFilter.Network, "WorldSession.HandleInspectOpcode: Target {0} not found.", inspect.Target.ToString());
@@ -79,7 +79,7 @@ namespace Game
[WorldPacketHandler(ClientOpcodes.QueryInspectAchievements)]
void HandleQueryInspectAchievements(QueryInspectAchievements inspect)
{
Player player = Global.ObjAccessor.FindPlayer(inspect.Guid);
Player player = Global.ObjAccessor.GetPlayer(_player, inspect.Guid);
if (!player)
{
Log.outDebug(LogFilter.Network, "WorldSession.HandleQueryInspectAchievements: [{0}] inspected unknown Player [{1}]", GetPlayer().GetGUID().ToString(), inspect.Guid.ToString());
Source/Game/Handlers/LootHandler.cs
+2 -1
View File
@@ -470,7 +470,8 @@ namespace Game
return;
}
Player target = Global.ObjAccessor.FindPlayer(target_playerguid);
// player on other map
Player target = Global.ObjAccessor.GetPlayer(_player, target_playerguid);
if (!target)
{
GetPlayer().SendLootError(lootguid, ObjectGuid.Empty, LootError.PlayerNotFound);
Source/Game/Handlers/VehicleHandler.cs
+4 -1
View File
@@ -144,7 +144,7 @@ namespace Game
[WorldPacketHandler(ClientOpcodes.RideVehicleInteract)]
void HandleRideVehicleInteract(RideVehicleInteract packet)
{
Player player = Global.ObjAccessor.FindPlayer(packet.Vehicle);
Player player = Global.ObjAccessor.GetPlayer(_player, packet.Vehicle);
if (player)
{
if (!player.GetVehicleKit())
@@ -153,6 +153,9 @@ namespace Game
return;
if (!player.IsWithinDistInMap(GetPlayer(), SharedConst.InteractionDistance))
return;
// Dont' allow players to enter player vehicle on arena
if (!_player.GetMap() || _player.GetMap().IsBattleArena())
return;
GetPlayer().EnterVehicle(player);
}