From ad5c028bd0c14a49d849873da2f1f315e5c451b9 Mon Sep 17 00:00:00 2001
From: John Magdy Lotfy Kamel <19735243+Zorono@users.noreply.github.com>
Date: Sun, 15 Jun 2025 15:04:42 +0300
Subject: [PATCH 1/5] Update Pawn.RakNet.inc

---
 src/Pawn.RakNet.inc | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Pawn.RakNet.inc b/src/Pawn.RakNet.inc
index 75a59fe..b0345ca 100644
--- a/src/Pawn.RakNet.inc
+++ b/src/Pawn.RakNet.inc
@@ -111,17 +111,17 @@
         #define PR_BITS_TO_BYTES(%0) (((%0)+7)>>3)
         #define PR_BYTES_TO_BITS(%0) ((%0)<<3)
 
-        #define PR_Handler<%0,%1>:%2(%3) \
-        forward pr_r%1_%2(); \
-        public pr_r%1_%2() PR_RegHandler(%2,"pr_"#%1"_"#%2,%0); \
-        forward pr_%1_%2(%3); \
-        public pr_%1_%2(%3)
-
-        #define IPacket:%0(%1) PR_Handler<PR_INCOMING_PACKET,ip>:%0(%1)
-        #define IRPC:%0(%1) PR_Handler<PR_INCOMING_RPC,ir>:%0(%1)
-        #define OPacket:%0(%1) PR_Handler<PR_OUTGOING_PACKET,op>:%0(%1)
-        #define ORPC:%0(%1) PR_Handler<PR_OUTGOING_RPC,or>:%0(%1)
-        #define ICustomRPC:%0(%1) PR_Handler<PR_INCOMING_CUSTOM_RPC,icr>:%0(%1)
+        #define PR_Handler<%0,%1>:%2@%4(%3) \
+        forward pr_r%1_%2@%4(); \
+        public pr_r%1_%2@%4() PR_RegHandler(%2,"pr_"#%1"_"#%2"@"#%4,%0); \
+        forward pr_%1_%2@%4(%3); \
+        public pr_%1_%2@%4(%3)
+
+        #define IPacket:%0@%2(%1) PR_Handler<PR_INCOMING_PACKET,ip>:%0@%2(%1)
+        #define IRPC:%0@%2(%1) PR_Handler<PR_INCOMING_RPC,ir>:%0@%2(%1)
+        #define OPacket:%0@%2(%1) PR_Handler<PR_OUTGOING_PACKET,op>:%0@%2(%1)
+        #define ORPC:%0@%2(%1) PR_Handler<PR_OUTGOING_RPC,or>:%0@%2(%1)
+        #define ICustomRPC:%0@%2(%1) PR_Handler<PR_INCOMING_CUSTOM_RPC,icr>:%0@%2(%1)
 
         #define IncomingPacket IPacket
         #define IncomingRPC IRPC

From 6a14d28688ac83abd9eb522f3246124eca357bd9 Mon Sep 17 00:00:00 2001
From: John Magdy Lotfy Kamel <19735243+Zorono@users.noreply.github.com>
Date: Sun, 15 Jun 2025 15:05:08 +0300
Subject: [PATCH 2/5] Update script.h

---
 src/script.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/script.h b/src/script.h
index 1e9e5e8..e75f9b7 100644
--- a/src/script.h
+++ b/src/script.h
@@ -165,7 +165,7 @@ class Script : public ptl::AbstractScript<Script> {
 
  private:
   const std::regex regex_reg_handler_public_name_{
-      R"(^pr_r(?:ip|ir|op|or|irp|iip|oip|icr)_\w+$)"};
+      R"(^pr_r(?:ip|ir|op|or|irp|iip|oip|icr)_\w+@[a-zA-Z0-9]+$)"};
 
   std::shared_ptr<Config> config_;
 

From 6886f59e81bd67bac9a6f39887ae803e117a6ef5 Mon Sep 17 00:00:00 2001
From: John Magdy Lotfy Kamel <19735243+Zorono@users.noreply.github.com>
Date: Sun, 15 Jun 2025 15:13:12 +0300
Subject: [PATCH 3/5] restore support for old syntax for compatabillity

---
 src/Pawn.RakNet.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Pawn.RakNet.inc b/src/Pawn.RakNet.inc
index b0345ca..48c1369 100644
--- a/src/Pawn.RakNet.inc
+++ b/src/Pawn.RakNet.inc
@@ -123,6 +123,12 @@
         #define ORPC:%0@%2(%1) PR_Handler<PR_OUTGOING_RPC,or>:%0@%2(%1)
         #define ICustomRPC:%0@%2(%1) PR_Handler<PR_INCOMING_CUSTOM_RPC,icr>:%0@%2(%1)
 
+        #define IPacket:%0(%1) PR_Handler<PR_INCOMING_PACKET,ip>:%0@default(%1)
+        #define IRPC:%0(%1) PR_Handler<PR_INCOMING_RPC,ir>:%0@default(%1)
+        #define OPacket:%0(%1) PR_Handler<PR_OUTGOING_PACKET,op>:%0@default(%1)
+        #define ORPC:%0(%1) PR_Handler<PR_OUTGOING_RPC,or>:%0@default(%1)
+        #define ICustomRPC:%0(%1) PR_Handler<PR_INCOMING_CUSTOM_RPC,icr>:%0@default(%1)
+
         #define IncomingPacket IPacket
         #define IncomingRPC IRPC
         #define OutgoingPacket OPacket

From 9e61477e1844344f519a72971921dcd9bd101581 Mon Sep 17 00:00:00 2001
From: John Magdy Lotfy Kamel <19735243+Zorono@users.noreply.github.com>
Date: Sun, 15 Jun 2025 23:55:02 +0300
Subject: [PATCH 4/5] Update Pawn.RakNet.inc

---
 src/Pawn.RakNet.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Pawn.RakNet.inc b/src/Pawn.RakNet.inc
index 48c1369..6e5bab8 100644
--- a/src/Pawn.RakNet.inc
+++ b/src/Pawn.RakNet.inc
@@ -117,11 +117,11 @@
         forward pr_%1_%2@%4(%3); \
         public pr_%1_%2@%4(%3)
 
-        #define IPacket:%0@%2(%1) PR_Handler<PR_INCOMING_PACKET,ip>:%0@%2(%1)
-        #define IRPC:%0@%2(%1) PR_Handler<PR_INCOMING_RPC,ir>:%0@%2(%1)
-        #define OPacket:%0@%2(%1) PR_Handler<PR_OUTGOING_PACKET,op>:%0@%2(%1)
-        #define ORPC:%0@%2(%1) PR_Handler<PR_OUTGOING_RPC,or>:%0@%2(%1)
-        #define ICustomRPC:%0@%2(%1) PR_Handler<PR_INCOMING_CUSTOM_RPC,icr>:%0@%2(%1)
+        #define cIPacket:%0(%1)<%2> PR_Handler<PR_INCOMING_PACKET,ip>:%0@%2(%1)
+        #define cIRPC:%0(%1)<%2> PR_Handler<PR_INCOMING_RPC,ir>:%0@%2(%1)
+        #define cOPacket:%0(%1)<%2> PR_Handler<PR_OUTGOING_PACKET,op>:%0@%2(%1)
+        #define cORPC:%0(%1)<%2> PR_Handler<PR_OUTGOING_RPC,or>:%0@%2(%1)
+        #define cICustomRPC:%0(%1)<%2> PR_Handler<PR_INCOMING_CUSTOM_RPC,icr>:%0@%2(%1)
 
         #define IPacket:%0(%1) PR_Handler<PR_INCOMING_PACKET,ip>:%0@default(%1)
         #define IRPC:%0(%1) PR_Handler<PR_INCOMING_RPC,ir>:%0@default(%1)

From 4e8ead41675ff017fe6375d0fa0ef6fc82cc7180 Mon Sep 17 00:00:00 2001
From: John Magdy Lotfy Kamel <19735243+Zorono@users.noreply.github.com>
Date: Mon, 16 Jun 2025 00:15:44 +0300
Subject: [PATCH 5/5] reversing this addition to add backward compatabillity

---
 src/Pawn.RakNet.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Pawn.RakNet.inc b/src/Pawn.RakNet.inc
index 6e5bab8..3913e93 100644
--- a/src/Pawn.RakNet.inc
+++ b/src/Pawn.RakNet.inc
@@ -117,11 +117,11 @@
         forward pr_%1_%2@%4(%3); \
         public pr_%1_%2@%4(%3)
 
-        #define cIPacket:%0(%1)<%2> PR_Handler<PR_INCOMING_PACKET,ip>:%0@%2(%1)
-        #define cIRPC:%0(%1)<%2> PR_Handler<PR_INCOMING_RPC,ir>:%0@%2(%1)
-        #define cOPacket:%0(%1)<%2> PR_Handler<PR_OUTGOING_PACKET,op>:%0@%2(%1)
-        #define cORPC:%0(%1)<%2> PR_Handler<PR_OUTGOING_RPC,or>:%0@%2(%1)
-        #define cICustomRPC:%0(%1)<%2> PR_Handler<PR_INCOMING_CUSTOM_RPC,icr>:%0@%2(%1)
+        #define IPacket:%0(%1)<%2> PR_Handler<PR_INCOMING_PACKET,ip>:%0@%2(%1)
+        #define IRPC:%0(%1)<%2> PR_Handler<PR_INCOMING_RPC,ir>:%0@%2(%1)
+        #define OPacket:%0(%1)<%2> PR_Handler<PR_OUTGOING_PACKET,op>:%0@%2(%1)
+        #define ORPC:%0(%1)<%2> PR_Handler<PR_OUTGOING_RPC,or>:%0@%2(%1)
+        #define ICustomRPC:%0(%1)<%2> PR_Handler<PR_INCOMING_CUSTOM_RPC,icr>:%0@%2(%1)
 
         #define IPacket:%0(%1) PR_Handler<PR_INCOMING_PACKET,ip>:%0@default(%1)
         #define IRPC:%0(%1) PR_Handler<PR_INCOMING_RPC,ir>:%0@default(%1)