From 3d7bb6fc5cde43f354bbc69180fa1e5c74330614 Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Tue, 10 Aug 2021 09:00:21 -0400
Subject: [PATCH] Use full namespace name to fix collisions with Dalamud stuff

Lumina.Excel.GeneratedSheets.Condition collides with Dalamud.ClientState.Conditions.Condiition
---
 Dalamud/Game/ClientState/ClientState.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dalamud/Game/ClientState/ClientState.cs b/Dalamud/Game/ClientState/ClientState.cs
index b9e40ccd7..0df4c1f69 100644
--- a/Dalamud/Game/ClientState/ClientState.cs
+++ b/Dalamud/Game/ClientState/ClientState.cs
@@ -1,14 +1,16 @@
 using System;
 using System.ComponentModel;
+using System.Linq;
 using System.Runtime.InteropServices;
 
 using Dalamud.Game.ClientState.Actors;
 using Dalamud.Game.ClientState.Actors.Types;
+using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.ClientState.Fates;
-using Dalamud.Game.Internal;
+using Dalamud.Game.ClientState.GamePad;
+using Dalamud.Game.ClientState.Keys;
 using Dalamud.Hooking;
 using JetBrains.Annotations;
-using Lumina.Excel.GeneratedSheets;
 using Serilog;
 
 namespace Dalamud.Game.ClientState
@@ -93,7 +95,7 @@ namespace Dalamud.Game.ClientState
         /// <summary>
         /// Event that gets fired when a duty is ready.
         /// </summary>
-        public event EventHandler<ContentFinderCondition> CfPop;
+        public event EventHandler<Lumina.Excel.GeneratedSheets.ContentFinderCondition> CfPop;
 
         /// <summary>
         /// Gets the table of all present actors.
@@ -194,7 +196,7 @@ namespace Dalamud.Game.ClientState
             return this.setupTerritoryTypeHook.Original(manager, terriType);
         }
 
-        private void NetworkHandlersOnCfPop(object sender, ContentFinderCondition e)
+        private void NetworkHandlersOnCfPop(object sender, Lumina.Excel.GeneratedSheets.ContentFinderCondition e)
         {
             this.CfPop?.Invoke(this, e);
         }