Skip to content

Commit

Permalink
Fix multiply event handler
Browse files Browse the repository at this point in the history
  • Loading branch information
Shiro committed May 11, 2023
1 parent b4127eb commit 636323a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 2 additions & 0 deletions Daigassou/Forms/MuiltiPlayForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ void startNetworkParser(Process process)
networkParser.process = process;
networkParser.isUsingEnsembleAssist = radioBtnGA.Checked;
networkParser.StartNetworkMonitor();
networkParser.Play -= NetworkParser_Play;
networkParser.Play += NetworkParser_Play;

}

uiPanel1.Enabled = !value;
Expand Down
7 changes: 4 additions & 3 deletions Daigassou/Network/NetworkParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public bool StartNetworkMonitor()
{
try
{

monitor = new FFXIVNetworkMonitor();
monitor.MessageReceivedEventHandler = (
TCPConnection connection,
Expand All @@ -95,7 +96,7 @@ byte[] message
byte[] message
) => MessageSent(connection, epoch, message);

monitor. = true;
monitor.UseDeucalion= true;
//monitor.MonitorType = Properties.Settings.Default.isUsingWinPCap? NetworkMonitorType.WinPCap: NetworkMonitorType.RawSocket;
monitor.ProcessID=((uint) process.Id);
monitor.OodleImplementation = OodleImplementation.FfxivTcp;
Expand Down Expand Up @@ -154,9 +155,9 @@ private void MessageReceived(TCPConnection connection, long epoch, byte[] messag
{
var res = Parse(message);


ushort opCode = res.header.MessageType;

if (isUsingEnsembleAssist)
{
if (opCode == opcodeDict["ensembleStartPacket"] ) //ensemble start
Expand Down
6 changes: 3 additions & 3 deletions Daigassou/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("ffxiv.cat")]
[assembly: AssemblyProduct("Daigassou")]
[assembly: AssemblyCopyright("Copyright © shiro@ffxiv.cat 2018-2022")]
[assembly: AssemblyCopyright("Copyright © shiro@ffxiv.cat 2018-2023")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.8.5.7")]
[assembly: AssemblyFileVersion("2.8.5.7")]
[assembly: AssemblyVersion("2.8.5.9")]
[assembly: AssemblyFileVersion("2.8.5.9")]

0 comments on commit 636323a

Please sign in to comment.