From 190955fa4841fc7ef1ce75481927d7d6e22dee61 Mon Sep 17 00:00:00 2001
From: BenCat07 <BenCat07@gmail.com>
Date: Fri, 4 May 2018 15:57:32 +0200
Subject: [PATCH 1/3] Ipc id added to csv

---
 src/chatlog.cpp          |  3 +--
 src/hacks/AutoJoin.cpp   | 12 ++++++------
 src/hooks/CreateMove.cpp |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/chatlog.cpp b/src/chatlog.cpp
index fb356b4f..26ebb3ff 100644
--- a/src/chatlog.cpp
+++ b/src/chatlog.cpp
@@ -133,8 +133,7 @@ void LogMessage(int eid, std::string message)
         if (x == '\n' || x == '\r')
             x = '*';
     }
-
     logger() << std::to_string(time(nullptr)) << std::to_string(info.friendsID)
-             << name << message << csv_stream::end;
+             << name << message << std::to_string(ipc::peer->client_id) <<csv_stream::end;
 }
 }
diff --git a/src/hacks/AutoJoin.cpp b/src/hacks/AutoJoin.cpp
index 8f77da81..701c40d6 100644
--- a/src/hacks/AutoJoin.cpp
+++ b/src/hacks/AutoJoin.cpp
@@ -47,8 +47,8 @@ bool UnassignedClass()
 
 Timer autoqueue_timer{};
 Timer req_timer{};
-/*CatVar party_bypass(CV_SWITCH, "party_bypass", "0", "Party Bypass",
-                   "Bypass Party restrictions");*/
+CatVar party_bypass(CV_SWITCH, "party_bypass", "0", "Party Bypass",
+                   "Bypass Party restrictions");
 void UpdateSearch()
 {
     // segfaults for no reason
@@ -56,19 +56,19 @@ void UpdateSearch()
     if (party_bypass && !calld) {
         static unsigned char patch[] = { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90};
         static uintptr_t party_addr1 = gSignatures.GetClientSignature(
-             "0F 84 ? ? ? ? 8B 7B ? 8D 45 ?");
+             "0F 84 ? ? ? ? 8B 7B ? 8D 45");
         static unsigned char patch2[] = { 0x90, 0xE9};
         static uintptr_t party_addr2 = gSignatures.GetClientSignature(
-            "0F 8E ? ? ? ? 31 DB 0F B6 BD ? ? ? ?");
+            "0F 8E ? ? ? ? 31 DB 0F B6 BD");
         static unsigned char patch3[] = { 0x90, 0x90};
         static uintptr_t party_addr3 = gSignatures.GetClientSignature(
             "74 ? E8 ? ? ? ? 89 F1");
         static unsigned char patch4[] = { 0x90, 0xE9};
         static uintptr_t party_addr4 = gSignatures.GetClientSignature(
-            "0F 85 ? ? ? ? E8 ? ? ? ? C7 04 24 ? ? ? ? 89 44 24 ?");
+            "0F 85 ? ? ? ? E8 ? ? ? ? C7 04 24 ? ? ? ? 89 44 24");
         static unsigned char patch5[] = { 0x90, 0x90, 0x90, 0x90};
         static uintptr_t party_addr5 = gSignatures.GetClientSignature(
-            "0F 84 ? ? ? ? 8B 45 ? 8B 70 ? 8B 78 ? 8D 45 ?");
+            "0F 84 ? ? ? ? 8B 45 ? 8B 70 ? 8B 78 ? 8D 45");
         Patch((void *) party_addr1, (void *) patch, sizeof(patch));
         Patch((void *) party_addr2, (void *) patch2, sizeof(patch2));
         Patch((void *) party_addr3, (void *) patch3, sizeof(patch3));
diff --git a/src/hooks/CreateMove.cpp b/src/hooks/CreateMove.cpp
index d6c047ab..4dd71aaf 100644
--- a/src/hooks/CreateMove.cpp
+++ b/src/hooks/CreateMove.cpp
@@ -487,7 +487,7 @@ DEFINE_HOOKED_METHOD(CreateMove, bool, void *this_, float input_sample_time,
                 g_IEngine->ServerCmd("use", false);
         }
         else {
-    	    NET_StringCmd senddata("voicemenu 0 0");
+    	    NET_StringCmd senddata("use");
     	    INetChannel *ch2 = (INetChannel *) g_IEngine->GetNetChannelInfo();
 	        senddata.SetNetChannel(ch2);
 	        senddata.SetReliable(false);

From aeae5520bc6d4af5ea1dbe5370a9fa1d316ad72a Mon Sep 17 00:00:00 2001
From: BenCat07 <BenCat07@gmail.com>
Date: Fri, 4 May 2018 15:59:51 +0200
Subject: [PATCH 2/3] Undo serverlag replace

---
 src/hooks/CreateMove.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/CreateMove.cpp b/src/hooks/CreateMove.cpp
index 4dd71aaf..d6c047ab 100644
--- a/src/hooks/CreateMove.cpp
+++ b/src/hooks/CreateMove.cpp
@@ -487,7 +487,7 @@ DEFINE_HOOKED_METHOD(CreateMove, bool, void *this_, float input_sample_time,
                 g_IEngine->ServerCmd("use", false);
         }
         else {
-    	    NET_StringCmd senddata("use");
+    	    NET_StringCmd senddata("voicemenu 0 0");
     	    INetChannel *ch2 = (INetChannel *) g_IEngine->GetNetChannelInfo();
 	        senddata.SetNetChannel(ch2);
 	        senddata.SetReliable(false);

From 3c94464a77929453f1ad80996e6c45aa60b9f53c Mon Sep 17 00:00:00 2001
From: BenCat07 <BenCat07@gmail.com>
Date: Fri, 4 May 2018 16:00:54 +0200
Subject: [PATCH 3/3] remove party bypass cvar

---
 src/hacks/AutoJoin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hacks/AutoJoin.cpp b/src/hacks/AutoJoin.cpp
index 701c40d6..e2985e94 100644
--- a/src/hacks/AutoJoin.cpp
+++ b/src/hacks/AutoJoin.cpp
@@ -47,8 +47,8 @@ bool UnassignedClass()
 
 Timer autoqueue_timer{};
 Timer req_timer{};
-CatVar party_bypass(CV_SWITCH, "party_bypass", "0", "Party Bypass",
-                   "Bypass Party restrictions");
+/*CatVar party_bypass(CV_SWITCH, "party_bypass", "0", "Party Bypass",
+                   "Bypass Party restrictions");*/
 void UpdateSearch()
 {
     // segfaults for no reason