Max/ppc_amnet
1
0
Fork 0
mirror of https://gitea.tendokyu.moe/ppc/amnet.git synced 2026-09-28 09:47:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tendokyu/ic-scanning' into ic-scanning

Browse Source
This commit is contained in:
ppc
2025-01-15 11:25:39 +00:00
parent bc48917fe8 13cee9a431
commit 5b19207a91
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AMNet.Server/CardPresenter.cs
+1 -1
View File
@@ -36,7 +36,7 @@ internal class CardPresenter
lock (_cardLock)
{
// IDm and requireIDm are mutually exclusive
if (_currentCard == null || (requireIDm.HasValue && (_currentCard.IDm == null) ^ requireIDm.Value))
if (_currentCard == null || (requireIDm.HasValue && (_currentCard.IDm != null) ^ requireIDm.Value))
{
return null;
}
AMNet.Server/Config.cs
+3
View File
@@ -1,4 +1,5 @@
using System;
using System.Reflection;
using Windows.Win32;
using Windows.Win32.Foundation;
@@ -41,6 +42,8 @@ internal static class Config
/// </summary>
public static string AimeTxtPath { get; }
public static Version ServerVersion { get; } = new(Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyFileVersionAttribute>()?.Version ?? "1.0");
internal static unsafe string ReadKey(string section, string key, uint maxLength, string @default = null)
{
// +1 for null terminator
AMNet.Server/DllMain.cs
+2 -2
View File
@@ -36,7 +36,7 @@ public static class DllMain
CancellationTokenRegistration? cancellationRegistration = null;
cancellationRegistration = App.Lifetime.ApplicationStarted.Register(() =>
{
App.Logger.LogInformation("AMNet Server ({gameId}) started successfully.", Config.GameId ?? "SXXX");
App.Logger.LogInformation("AMNet Server v{version} ({gameId}) started.", Config.ServerVersion.ToString(Config.ServerVersion.Build > 0 ? 3 : 2), Config.GameId ?? "SXXX");
App.Logger.LogInformation("Visit {addr} from a mobile device on the same network to get started.", WebAddress);
// ReSharper disable once AccessToModifiedClosure
@@ -125,7 +125,7 @@ public static class DllMain
}
Marshal.Copy(card.IDm, 0, idm, sizeof(ulong));
App.Logger.LogInformation("FeliCa IDm read: {idm}", card.IDm);
App.Logger.LogInformation("FeliCa IDm read: {idm}", CardPresenter.FormatHexCode(card.IDm));
return 0;
}