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

Improvements (#903)

Browse source
This commit is contained in:
kizer 2022-06-29 18:51:40 +09:00 • committed by GitHub
parent e9cd7e0273
commit 716736f022
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
55 changed files with 1809 additions and 872 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Dalamud/Game/Network/Internal/NetworkHandlers.cs
View file

@ -28,6 +28,9 @@ namespace Dalamud.Game.Network.Internal
private readonly IMarketBoardUploader uploader;
[ServiceManager.ServiceDependency]
private readonly DalamudConfiguration configuration = Service<DalamudConfiguration>.Get();
private MarketBoardPurchaseHandler marketBoardPurchaseHandler;
[ServiceManager.ServiceConstructor]
@ -47,14 +50,12 @@ namespace Dalamud.Game.Network.Internal
{
var dataManager = Service<DataManager>.GetNullable();
if (dataManager?.IsDataReady == false)
if (dataManager?.IsDataReady != true)
return;
var configuration = Service<DalamudConfiguration>.Get();
if (direction == NetworkMessageDirection.ZoneUp)
{
if (configuration.IsMbCollect)
if (this.configuration.IsMbCollect)
{
if (opCode == dataManager.ClientOpCodes["MarketBoardPurchaseHandler"])
{
@ -72,7 +73,7 @@ namespace Dalamud.Game.Network.Internal
return;
}
if (configuration.IsMbCollect)
if (this.configuration.IsMbCollect)
{
if (opCode == dataManager.ServerOpCodes["MarketBoardItemRequestStart"])
{
@ -236,8 +237,9 @@ namespace Dalamud.Game.Network.Internal
private unsafe void HandleCfPop(IntPtr dataPtr)
{
var dataManager = Service<DataManager>.Get();
var configuration = Service<DalamudConfiguration>.Get();
var dataManager = Service<DataManager>.GetNullable();
if (dataManager == null)
return;
using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 64);
using var reader = new BinaryReader(stream);
@ -266,7 +268,7 @@ namespace Dalamud.Game.Network.Internal
}
// Flash window
if (configuration.DutyFinderTaskbarFlash && !NativeFunctions.ApplicationIsActivated())
if (this.configuration.DutyFinderTaskbarFlash && !NativeFunctions.ApplicationIsActivated())
{
var flashInfo = new NativeFunctions.FlashWindowInfo
{
@ -281,9 +283,9 @@ namespace Dalamud.Game.Network.Internal
Task.Run(() =>
{
if (configuration.DutyFinderChatMessage)
if (this.configuration.DutyFinderChatMessage)
{
Service<ChatGui>.Get().Print($"Duty pop: {cfcName}");
Service<ChatGui>.GetNullable()?.Print($"Duty pop: {cfcName}");
}
this.CfPop?.Invoke(this, cfCondition);