From d9cf0e3a361a74158f4505a34c1684ed4e5f6b17 Mon Sep 17 00:00:00 2001
From: Hondacrx <prelude_20032002@yahoo.com>
Date: Wed, 4 Jun 2025 09:08:00 -0400
Subject: [PATCH] Core/Conditions: Allow conditions for seen object in
 CONDITION_SOURCE_TYPE_OBJECT_ID_VISIBILITY

Port From (https://github.com/TrinityCore/TrinityCore/commit/6e3c8a84637cc669fe08c3933ce5323f8cf4c5cb)
---
 Source/Game/Conditions/Condition.cs        | 1 +
 Source/Game/Conditions/ConditionManager.cs | 8 ++++----
 Source/Game/Entities/Object/WorldObject.cs | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Source/Game/Conditions/Condition.cs b/Source/Game/Conditions/Condition.cs
index bebab37c3..38398bee1 100644
--- a/Source/Game/Conditions/Condition.cs
+++ b/Source/Game/Conditions/Condition.cs
@@ -637,6 +637,7 @@ namespace Game.Conditions
                 case ConditionSourceType.SmartEvent:
                 case ConditionSourceType.NpcVendor:
                 case ConditionSourceType.SpellProc:
+                case ConditionSourceType.ObjectIdVisibility:
                     return 2;
                 default:
                     return 1;
diff --git a/Source/Game/Conditions/ConditionManager.cs b/Source/Game/Conditions/ConditionManager.cs
index 7c29540b1..14d5cb71c 100644
--- a/Source/Game/Conditions/ConditionManager.cs
+++ b/Source/Game/Conditions/ConditionManager.cs
@@ -312,13 +312,13 @@ namespace Game
             return true;
         }
 
-        public bool IsObjectMeetingVisibilityByObjectIdConditions(uint objectType, uint entry, WorldObject seer)
+        public bool IsObjectMeetingVisibilityByObjectIdConditions(WorldObject obj, WorldObject seer)
         {
-            var conditions = ConditionStorage[ConditionSourceType.ObjectIdVisibility].LookupByKey(new ConditionId(objectType, (int)entry, 0));
+            var conditions = ConditionStorage[ConditionSourceType.ObjectIdVisibility].LookupByKey(new ConditionId((uint)obj.GetTypeId(), (int)obj.GetEntry(), 0));
             if (conditions != null)
             {
-                Log.outDebug(LogFilter.Condition, $"IsObjectMeetingVisibilityByObjectIdConditions: found conditions for objectType {objectType} entry {entry}");
-                return IsObjectMeetToConditions(seer, conditions);
+                Log.outDebug(LogFilter.Condition, $"IsObjectMeetingVisibilityByObjectIdConditions: found conditions for objectType {obj.GetTypeId()} entry {obj.GetEntry()} guid {obj.GetGUID()}");
+                return IsObjectMeetToConditions(seer, obj, conditions);
             }
             return true;
         }
diff --git a/Source/Game/Entities/Object/WorldObject.cs b/Source/Game/Entities/Object/WorldObject.cs
index b1d11b146..7b89f3743 100644
--- a/Source/Game/Entities/Object/WorldObject.cs
+++ b/Source/Game/Entities/Object/WorldObject.cs
@@ -1271,7 +1271,7 @@ namespace Game.Entities
             if (smoothPhasing != null && smoothPhasing.IsBeingReplacedForSeer(GetGUID()))
                 return false;
 
-            if (!obj.IsPrivateObject() && !Global.ConditionMgr.IsObjectMeetingVisibilityByObjectIdConditions((uint)obj.GetTypeId(), obj.GetEntry(), this))
+            if (!obj.IsPrivateObject() && !Global.ConditionMgr.IsObjectMeetingVisibilityByObjectIdConditions(obj, this))
                 return false;
 
             // Spawn tracking