ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-02 13:53:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #509 from daemitus/misc

Browse source 
Small misc stuff + client structs bump
This commit is contained in:
goaaats 2021-08-27 23:20:56 +02:00 • committed by GitHub
commit 873d0c6305
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 44 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Dalamud/EntryPoint.cs
View file

@ -198,8 +198,7 @@ namespace Dalamud
var info = "Further information could not be obtained";
if (ex.TargetSite != null && ex.TargetSite.DeclaringType != null)
{
info =
$"{ex.TargetSite.DeclaringType.Assembly.GetName().Name}, {ex.TargetSite.DeclaringType.FullName}::{ex.TargetSite.Name}";
info = $"{ex.TargetSite.DeclaringType.Assembly.GetName().Name}, {ex.TargetSite.DeclaringType.FullName}::{ex.TargetSite.Name}";
}
const MessageBoxType flags = NativeFunctions.MessageBoxType.YesNo | NativeFunctions.MessageBoxType.IconError | NativeFunctions.MessageBoxType.SystemModal;

2
Dalamud/Game/ClientState/Objects/SubKinds/BattleNpc.cs
View file

@ -25,6 +25,6 @@ namespace Dalamud.Game.ClientState.Objects.Types
public BattleNpcSubKind BattleNpcKind => (BattleNpcSubKind)this.Struct->Character.GameObject.SubKind;
/// <inheritdoc/>
public override uint TargetObjectId => this.Struct->BattleNpcTargetObjectId;
public override uint TargetObjectId => this.Struct->Character.TargetObjectID;
}
}

2
Dalamud/Game/ClientState/Objects/Types/GameObject.cs
View file

@ -170,6 +170,6 @@ namespace Dalamud.Game.ClientState.Objects.Types
private protected FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject* Struct => (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)this.Address;
/// <inheritdoc/>
public override string ToString() => $"{this.ObjectId:X}({this.Name.TextValue} - {this.ObjectKind.ToString()}) at {this.Address:X}";
public override string ToString() => $"{this.ObjectId:X}({this.Name.TextValue} - {this.ObjectKind}) at {this.Address:X}";
}
}

3
Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs
View file

@ -41,8 +41,7 @@ namespace Dalamud.Interface.Internal.Windows
private const int PluginIconHeight = 512;
// TODO: Change back to master after release
private const string MainRepoImageUrl =
"https://raw.githubusercontent.com/goatcorp/DalamudPlugins/api4/{0}/{1}/images/{2}";
private const string MainRepoImageUrl = "https://raw.githubusercontent.com/goatcorp/DalamudPlugins/api4/{0}/{1}/images/{2}";
private static readonly ModuleLog Log = new("PLUGINW");

4
Dalamud/Plugin/Internal/PluginManager.cs
View file

@ -958,7 +958,7 @@ namespace Dalamud.Plugin.Internal
{
this.AvailablePlugins = ImmutableList.CreateRange(this.availablePlugins);
this.UpdatablePlugins = ImmutableList.CreateRange(this.updatablePlugins);
this.OnAvailablePluginsChanged.Invoke();
this.OnAvailablePluginsChanged?.Invoke();
}
catch (Exception ex)
{
@ -974,7 +974,7 @@ namespace Dalamud.Plugin.Internal
{
this.InstalledPlugins = ImmutableList.CreateRange(this.installedPlugins);
this.UpdatablePlugins = ImmutableList.CreateRange(this.updatablePlugins);
this.OnInstalledPluginsChanged.Invoke();
this.OnInstalledPluginsChanged?.Invoke();
}
catch (Exception ex)
{