ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use full namespace name to fix collisions with Dalamud stuff

Browse source 
Lumina.Excel.GeneratedSheets.Condition collides with Dalamud.ClientState.Conditions.Condiition
This commit is contained in:
Raymond 2021-08-10 09:00:21 -04:00
parent c102e3e64e
commit 3d7bb6fc5c
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Dalamud/Game/ClientState/ClientState.cs
View file

@ -1,14 +1,16 @@
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Dalamud.Game.ClientState.Actors; using Dalamud.Game.ClientState.Actors;
using Dalamud.Game.ClientState.Actors.Types; using Dalamud.Game.ClientState.Actors.Types;
using Dalamud.Game.ClientState.Conditions;
using Dalamud.Game.ClientState.Fates; using Dalamud.Game.ClientState.Fates;
using Dalamud.Game.Internal; using Dalamud.Game.ClientState.GamePad;
using Dalamud.Game.ClientState.Keys;
using Dalamud.Hooking; using Dalamud.Hooking;
using JetBrains.Annotations; using JetBrains.Annotations;
using Lumina.Excel.GeneratedSheets;
using Serilog; using Serilog;
namespace Dalamud.Game.ClientState namespace Dalamud.Game.ClientState
@ -93,7 +95,7 @@ namespace Dalamud.Game.ClientState
/// <summary> /// <summary>
/// Event that gets fired when a duty is ready. /// Event that gets fired when a duty is ready.
/// </summary> /// </summary>
public event EventHandler<ContentFinderCondition> CfPop; public event EventHandler<Lumina.Excel.GeneratedSheets.ContentFinderCondition> CfPop;
/// <summary> /// <summary>
/// Gets the table of all present actors. /// Gets the table of all present actors.
@ -194,7 +196,7 @@ namespace Dalamud.Game.ClientState
return this.setupTerritoryTypeHook.Original(manager, terriType); 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); this.CfPop?.Invoke(this, e);
} }