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

Merge pull request #494 from daemitus/bugs

Browse source 
Bugs
This commit is contained in:
goaaats 2021-08-23 18:46:15 +02:00 • committed by GitHub
commit 89f39c99d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Dalamud/Game/Gui/GameGui.cs
View file

@ -125,6 +125,16 @@ namespace Dalamud.Game.Gui
/// </summary> /// </summary>
public event EventHandler<bool> OnUiHideToggled; public event EventHandler<bool> OnUiHideToggled;
/// <summary>
/// Event that is fired when the currently hovered item changes.
/// </summary>
public event EventHandler<ulong> HoveredItemChanged;
/// <summary>
/// Event that is fired when the currently hovered action changes.
/// </summary>
public event EventHandler<HoveredAction> HoveredActionChanged;
/// <summary> /// <summary>
/// Gets a value indicating whether the game UI is hidden. /// Gets a value indicating whether the game UI is hidden.
/// </summary> /// </summary>
@ -141,16 +151,6 @@ namespace Dalamud.Game.Gui
/// </summary> /// </summary>
public HoveredAction HoveredAction { get; } = new HoveredAction(); public HoveredAction HoveredAction { get; } = new HoveredAction();
/// <summary>
/// Gets or sets the event that is fired when the currently hovered item changes.
/// </summary>
public EventHandler<ulong> HoveredItemChanged { get; set; }
/// <summary>
/// Gets or sets the event that is fired when the currently hovered action changes.
/// </summary>
public EventHandler<HoveredAction> HoveredActionChanged { get; set; }
/// <summary> /// <summary>
/// Opens the in-game map with a flag on the location of the parameter. /// Opens the in-game map with a flag on the location of the parameter.
/// </summary> /// </summary>

10
Dalamud/Plugin/Internal/LocalPlugin.cs
View file

@ -139,7 +139,7 @@ namespace Dalamud.Plugin.Internal
/// <summary> /// <summary>
/// Gets the plugin manifest, if one exists. /// Gets the plugin manifest, if one exists.
/// </summary> /// </summary>
public LocalPluginManifest Manifest { get; } public LocalPluginManifest Manifest { get; private set; }
/// <summary> /// <summary>
/// Gets or sets the current state of the plugin. /// Gets or sets the current state of the plugin.
@ -242,6 +242,14 @@ namespace Dalamud.Plugin.Internal
if (reloading) if (reloading)
{ {
this.loader.Reload(); this.loader.Reload();
// Reload the manifest in-case there were changes here too.
if (this.IsDev)
{
var manifestFile = LocalPluginManifest.GetManifestFile(this.DllFile);
if (manifestFile.Exists)
this.Manifest = LocalPluginManifest.Load(manifestFile);
}
} }
// Load the assembly // Load the assembly