From d6c07eb41d22e25e6fd8b34be3b15e59c54af5ba Mon Sep 17 00:00:00 2001
From: raphaeIl <michaelsliu3@gmail.com>
Date: Mon, 1 Apr 2024 16:41:42 -0400
Subject: [PATCH] fix EndPoint null pointer

---
 BLHX.Server.Game/Connection.cs                       | 3 ++-
 BLHX.Server.PcapParser/App.config                    | 8 ++++----
 BLHX.Server.PcapParser/BLHX.Server.PcapParser.csproj | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/BLHX.Server.Game/Connection.cs b/BLHX.Server.Game/Connection.cs
index 35f6565..8e147b5 100644
--- a/BLHX.Server.Game/Connection.cs
+++ b/BLHX.Server.Game/Connection.cs
@@ -22,7 +22,8 @@ namespace BLHX.Server.Game
         readonly Task loopTask;
         ushort packetIdx = 0;
         private ushort NextPacketIdx => packetIdx;
-        public IPEndPoint EndPoint => (IPEndPoint?)tcpClient.Client.RemoteEndPoint ?? IPEndPoint.Parse("0.0.0.0:0");
+        public IPEndPoint EndPoint => tcpClient?.Client?.RemoteEndPoint as IPEndPoint ?? IPEndPoint.Parse("0.0.0.0:0");
+
 
         public Connection(TcpClient tcpClient)
         {
diff --git a/BLHX.Server.PcapParser/App.config b/BLHX.Server.PcapParser/App.config
index 5f986e8..a58a46e 100644
--- a/BLHX.Server.PcapParser/App.config
+++ b/BLHX.Server.PcapParser/App.config
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/BLHX.Server.PcapParser/BLHX.Server.PcapParser.csproj b/BLHX.Server.PcapParser/BLHX.Server.PcapParser.csproj
index 51cd527..6954ac4 100644
--- a/BLHX.Server.PcapParser/BLHX.Server.PcapParser.csproj
+++ b/BLHX.Server.PcapParser/BLHX.Server.PcapParser.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>BLHX.Server.PcapParser</RootNamespace>
     <AssemblyName>BLHX.Server.PcapParser</AssemblyName>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>