From 10e7828dbcad5667e96920f03450cdbaf2cc80e5 Mon Sep 17 00:00:00 2001
From: funjoker <funjoker109@gmail.com>
Date: Sun, 20 Feb 2022 22:06:22 +0100
Subject: [PATCH] Tools/Patcher: Fix incorrect Mac64 pattern and patches

---
 src/tools/connection_patcher/Patches/Mac.hpp  |  9 ++++-----
 src/tools/connection_patcher/Patterns/Mac.hpp | 12 ++++++++++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/tools/connection_patcher/Patches/Mac.hpp b/src/tools/connection_patcher/Patches/Mac.hpp
index 031b049563b..bd292734a25 100644
--- a/src/tools/connection_patcher/Patches/Mac.hpp
+++ b/src/tools/connection_patcher/Patches/Mac.hpp
@@ -33,14 +33,13 @@ namespace Connection_Patcher
                 {
                     return
                     {
-                        0xB8, 0xD5, 0xF8, 0x7F, 0x82, 0x89, 0x47, 0x0C, 0xC9, 0xC3, 0x90, 0x90, 0x90, 0x90, 0x90, 0x55,
-                        0x48, 0x89, 0xE5, 0x48, 0xC7, 0x07, 0x00, 0x00, 0x00, 0x00, 0x48, 0xC7, 0x47, 0x08, 0x00, 0x00,
-                        0x00, 0x00, 0x48, 0x8B, 0x05, 0x00, 0x00, 0x00, 0x00, 0x48, 0x89, 0x07, 0x8B, 0x05, 0x00, 0x00,
-                        0x00, 0x00, 0x89, 0x47, 0x08, 0xEB, 0xC9, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90
+                        0x55, 0x48, 0x89, 0xE5, 0x48, 0xC7, 0x07, 0x00, 0x00, 0x00, 0x00, 0x48, 0xC7, 0x47, 0x08, 0x00,
+                        0x00, 0x00, 0x00, 0x48, 0x8B, 0x05, 0xD6, 0xF3, 0x0D, 0x00, 0x48, 0x89, 0x07, 0x8B, 0x05, 0xD5,
+                        0xF3, 0x0D, 0x00, 0x89, 0x47, 0x08, 0xB8, 0xD5, 0xF8, 0x7F, 0x82, 0x89, 0x47, 0x0C, 0xC9, 0xC3
                     };
                 }
                 static const std::vector<unsigned char> Password() { return { 0x0F, 0x85 }; }
-                static const std::vector<unsigned char> Signature() { return { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0xEB }; }
+                static const std::vector<unsigned char> Signature() { return { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x48, 0x8D }; }
             };
         };
     }
diff --git a/src/tools/connection_patcher/Patterns/Mac.hpp b/src/tools/connection_patcher/Patterns/Mac.hpp
index 19f2650d741..6f1603fce40 100644
--- a/src/tools/connection_patcher/Patterns/Mac.hpp
+++ b/src/tools/connection_patcher/Patterns/Mac.hpp
@@ -29,9 +29,17 @@ namespace Connection_Patcher
         {
             struct x64
             {
-                static const std::vector<unsigned char> BNet() { return { 0x0F, 0x1F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x1F, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x48, 0x89, 0xE5, 0x48, 0xC7, 0x07, 0x00, 0x00, 0x00, 0x00, 0x48, 0xC7, 0x47 }; }
+                static const std::vector<unsigned char> BNet()
+                {
+                    return
+                    {
+                        0x55, 0x48, 0x89, 0xE5, 0x48, 0xC7, 0x07, 0x00, 0x00, 0x00, 0x00, 0x48, 0xC7, 0x47, 0x08, 0x00,
+                        0x00, 0x00, 0x00, 0x48, 0x8B, 0x05, 0xD6, 0xF3, 0x0D, 0x00, 0x48, 0x89, 0x07, 0x8B, 0x05, 0xD5,
+                        0xF3, 0x0D, 0x00, 0x89, 0x47, 0x08, 0x8B, 0x06, 0x89, 0x47, 0x0C, 0xC9, 0xC3, 0x90, 0x66, 0x90
+                    };
+                }
                 static const std::vector<unsigned char> Password() { return { 0x0F, 0x84, 0x00, 0x00, 0x00, 0x00, 0x49, 0x8B, 0x45, 0x00, 0xB9, 0x40 }; }
-                static const std::vector<unsigned char> Signature() { return { 0xE8, 0x00, 0x00, 0x00, 0x00, 0x84, 0xC0, 0x75, 0x00, 0x4C, 0x89, 0xEF, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x48, 0x8D, 0x05, 0x00, 0x00, 0x00, 0x00, 0x48 }; }
+                static const std::vector<unsigned char> Signature() { return { 0xE8, 0x93, 0x2A, 0x19, 0x00, 0x84, 0xC0, 0x0F, 0x84, 0x52, 0x02, 0x00, 0x00, 0x48, 0x8D }; }
             };
         };
     }