Skip to content

Commit

Permalink
Merge branch 'opcode-from-dalamud' into main
Browse files Browse the repository at this point in the history
# Conflicts:
#	Properties/AssemblyInfo.cs
#	autoSweep.json
  • Loading branch information
zhudotexe committed Mar 13, 2021
2 parents 625dc32 + 248754a commit 3b1bb40
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions Plugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public class Plugin : IDalamudPlugin

// configuration constants
private const string commandName = "/psweep";
private const int housingWardInfoOpcode = 0x015E; // https://github.com/SapphireServer/Sapphire/blob/master/src/common/Network/PacketDef/Ipcs.h#L257
private const int numWardsPerDistrict = 24;

// frameworks/data
Expand Down Expand Up @@ -85,7 +84,7 @@ private void OnNetworkEvent(IntPtr dataPtr, ushort opCode, uint sourceActorId, u
if (!this.configuration.Enabled) return;
if (direction != NetworkMessageDirection.ZoneDown) return;
if (!this.pi.Data.IsDataReady) return;
if (opCode == housingWardInfoOpcode)
if (opCode == this.pi.Data.ServerOpCodes["HousingWardInfo"])
{
this.OnHousingWardInfo(dataPtr);
}
Expand Down
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.2.1")]
[assembly: AssemblyFileVersion("0.0.2.1")]
[assembly: AssemblyVersion("0.0.2.2")]
[assembly: AssemblyFileVersion("0.0.2.2")]
4 changes: 2 additions & 2 deletions autoSweep.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"Name": "PaissaHouse",
"Description": "Makes note of open houses when viewing a housing ward from an aetheryte.",
"InternalName": "autoSweep",
"AssemblyVersion": "0.0.2.1",
"AssemblyVersion": "0.0.2.2",
"RepoUrl": "https://github.com/mommothazaz123/FFXIV_AutoSweep",
"ApplicableVersion": "2021.02.10.0000.0000",
"ApplicableVersion": "any",
"Tags": ["housing"],
"DalamudApiLevel": 2
}

0 comments on commit 3b1bb40

Please sign in to comment.