From cf54c6dc30d2c1c400dc5c67e75d1c879c8c483b Mon Sep 17 00:00:00 2001
From: goat <16760685+goaaats@users.noreply.github.com>
Date: Sun, 22 Aug 2021 23:14:08 +0200
Subject: [PATCH] refactor: ObjectTable.SearchByID -> SearchById
---
Dalamud/Game/ClientState/Buddy/BuddyMember.cs | 2 +-
Dalamud/Game/ClientState/Objects/ObjectTable.cs | 6 +++---
Dalamud/Game/ClientState/Objects/Types/GameObject.cs | 2 +-
Dalamud/Game/ClientState/Party/PartyMember.cs | 2 +-
Dalamud/Game/ClientState/Statuses/Status.cs | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Dalamud/Game/ClientState/Buddy/BuddyMember.cs b/Dalamud/Game/ClientState/Buddy/BuddyMember.cs
index cd991a4b2..0029d20db 100644
--- a/Dalamud/Game/ClientState/Buddy/BuddyMember.cs
+++ b/Dalamud/Game/ClientState/Buddy/BuddyMember.cs
@@ -36,7 +36,7 @@ namespace Dalamud.Game.ClientState.Buddy
///
/// This iterates the actor table, it should be used with care.
///
- public GameObject? GameObject => Service.Get().SearchByID(this.ObjectId);
+ public GameObject? GameObject => Service.Get().SearchById(this.ObjectId);
///
/// Gets the current health of this buddy.
diff --git a/Dalamud/Game/ClientState/Objects/ObjectTable.cs b/Dalamud/Game/ClientState/Objects/ObjectTable.cs
index 957ef7c68..529fdfaec 100644
--- a/Dalamud/Game/ClientState/Objects/ObjectTable.cs
+++ b/Dalamud/Game/ClientState/Objects/ObjectTable.cs
@@ -61,16 +61,16 @@ namespace Dalamud.Game.ClientState.Objects
///
/// Search for a game object by their Object ID.
///
- /// Object ID to find.
+ /// Object ID to find.
/// A game object or null.
- public GameObject? SearchByID(uint objectID)
+ public GameObject? SearchById(uint objectId)
{
foreach (var obj in this)
{
if (obj == null)
continue;
- if (obj.ObjectId == objectID)
+ if (obj.ObjectId == objectId)
return obj;
}
diff --git a/Dalamud/Game/ClientState/Objects/Types/GameObject.cs b/Dalamud/Game/ClientState/Objects/Types/GameObject.cs
index 06e944244..18f1be9c0 100644
--- a/Dalamud/Game/ClientState/Objects/Types/GameObject.cs
+++ b/Dalamud/Game/ClientState/Objects/Types/GameObject.cs
@@ -156,7 +156,7 @@ namespace Dalamud.Game.ClientState.Objects.Types
///
/// This iterates the actor table, it should be used with care.
///
- public virtual GameObject? TargetObject => Service.Get().SearchByID(this.TargetObjectId);
+ public virtual GameObject? TargetObject => Service.Get().SearchById(this.TargetObjectId);
///
/// Gets the underlying structure.
diff --git a/Dalamud/Game/ClientState/Party/PartyMember.cs b/Dalamud/Game/ClientState/Party/PartyMember.cs
index 2f7422c5d..9d70592f7 100644
--- a/Dalamud/Game/ClientState/Party/PartyMember.cs
+++ b/Dalamud/Game/ClientState/Party/PartyMember.cs
@@ -56,7 +56,7 @@ namespace Dalamud.Game.ClientState.Party
///
/// This iterates the actor table, it should be used with care.
///
- public GameObject? GameObject => Service.Get().SearchByID(this.ObjectId);
+ public GameObject? GameObject => Service.Get().SearchById(this.ObjectId);
///
/// Gets the current HP of this party member.
diff --git a/Dalamud/Game/ClientState/Statuses/Status.cs b/Dalamud/Game/ClientState/Statuses/Status.cs
index 833083bc2..b9a67a78b 100644
--- a/Dalamud/Game/ClientState/Statuses/Status.cs
+++ b/Dalamud/Game/ClientState/Statuses/Status.cs
@@ -61,7 +61,7 @@ namespace Dalamud.Game.ClientState.Statuses
///
/// This iterates the actor table, it should be used with care.
///
- public GameObject? SourceObject => Service.Get().SearchByID(this.SourceID);
+ public GameObject? SourceObject => Service.Get().SearchById(this.SourceID);
private FFXIVClientStructs.FFXIV.Client.Game.Status* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Status*)this.Address;
}