Some cleanups. (might break build for scripts as they are a WIP)

This commit is contained in:
hondacrx
2023-10-08 10:35:31 -04:00
parent fa10b981bd
commit cda53c8e7f
208 changed files with 2266 additions and 2329 deletions
+3 -3
View File
@@ -153,7 +153,7 @@ public class ObjectAccessor : Singleton<ObjectAccessor>
public Player GetPlayer(Map m, ObjectGuid guid)
{
Player player = _players.LookupByKey(guid);
if (player)
if (player != null)
if (player.IsInWorld && player.GetMap() == m)
return player;
@@ -181,12 +181,12 @@ public class ObjectAccessor : Singleton<ObjectAccessor>
public Player FindPlayer(ObjectGuid guid)
{
Player player = FindConnectedPlayer(guid);
return player && player.IsInWorld ? player : null;
return player != null && player.IsInWorld ? player : null;
}
public Player FindPlayerByName(string name)
{
Player player = PlayerNameMapHolder.Find(name);
if (!player || !player.IsInWorld)
if (player == null || !player.IsInWorld)
return null;
return player;