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

Entities/Unit: Cleanup all the direct accesses to m_unitMovedByMe. Refactor the field to be protected. Add assertions to catch dangling pointers.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/edc75831194bc2419e3abada47121fadf4b2aa8d)
This commit is contained in:
hondacrx
2021-12-23 20:17:08 -05:00
parent 4584543d45
commit 1f58dc2b53
5 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Handlers/SpellHandler.cs
+8 -8
View File
@@ -37,7 +37,7 @@ namespace Game
Player user = GetPlayer();
// ignore for remote control state
if (user.m_unitMovedByMe != user)
if (user.GetUnitBeingMoved() != user)
return;
Item item = user.GetUseableItemByPos(packet.PackSlot, packet.Slot);
@@ -133,7 +133,7 @@ namespace Game
Player player = GetPlayer();
// ignore for remote control state
if (player.m_unitMovedByMe != player)
if (player.GetUnitBeingMoved() != player)
return;
// additional check, client outputs message on its own
@@ -243,8 +243,8 @@ namespace Game
if (obj)
{
// ignore for remote control state
if (GetPlayer().m_unitMovedByMe != GetPlayer())
if (!(GetPlayer().IsOnVehicle(GetPlayer().m_unitMovedByMe) || GetPlayer().IsMounted()) && !obj.GetGoInfo().IsUsableMounted())
if (GetPlayer().GetUnitBeingMoved() != GetPlayer())
if (!(GetPlayer().IsOnVehicle(GetPlayer().GetUnitBeingMoved()) || GetPlayer().IsMounted()) && !obj.GetGoInfo().IsUsableMounted())
return;
obj.Use(GetPlayer());
@@ -255,7 +255,7 @@ namespace Game
void HandleGameobjectReportUse(GameObjReportUse packet)
{
// ignore for remote control state
if (GetPlayer().m_unitMovedByMe != GetPlayer())
if (GetPlayer().GetUnitBeingMoved() != GetPlayer())
return;
GameObject go = GetPlayer().GetGameObjectIfCanInteractWith(packet.Guid);
@@ -272,7 +272,7 @@ namespace Game
void HandleCastSpell(CastSpell cast)
{
// ignore for remote control state (for player case)
Unit mover = GetPlayer().m_unitMovedByMe;
Unit mover = GetPlayer().GetUnitBeingMoved();
if (mover != GetPlayer() && mover.IsTypeId(TypeId.Player))
return;
@@ -472,7 +472,7 @@ namespace Game
void HandleCancelChanneling(CancelChannelling cancelChanneling)
{
// ignore for remote control state (for player case)
Unit mover = _player.m_unitMovedByMe;
Unit mover = _player.GetUnitBeingMoved();
if (mover != _player && mover.IsTypeId(TypeId.Player))
return;
@@ -483,7 +483,7 @@ namespace Game
void HandleTotemDestroyed(TotemDestroyed totemDestroyed)
{
// ignore for remote control state
if (GetPlayer().m_unitMovedByMe != GetPlayer())
if (GetPlayer().GetUnitBeingMoved() != GetPlayer())
return;
byte slotId = totemDestroyed.Slot;