From 0503344c6b6418b7e7c05727e6f11e76e03291d1 Mon Sep 17 00:00:00 2001
From: drian <drian0@protonmail.com>
Date: Tue, 9 Feb 2021 06:59:12 +0100
Subject: [PATCH 1/2] #221 Client must guarantee that data sent over the
 network complies to the network protocol

---
 source/src/client.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/src/client.cpp b/source/src/client.cpp
index fffa8290..bf747b3c 100644
--- a/source/src/client.cpp
+++ b/source/src/client.cpp
@@ -395,8 +395,9 @@ void addmsg(int type, const char *fmt, ...)
             }
             case 's':
             {
-                const char *t = va_arg(args, const char *);
-                if(t) sendstring(t, p); nums++; break;
+                sendstring(va_arg(args, const char*), p); 
+                nums++; 
+                break;
             }
         }
         va_end(args);

From ceac59f0b20a7851b2554a2b75c67269a242a65c Mon Sep 17 00:00:00 2001
From: drian <drian0@protonmail.com>
Date: Tue, 9 Feb 2021 11:27:44 +0100
Subject: [PATCH 2/2] #223 Nade thrown above other players head should not
 bounce back

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

diff --git a/source/src/physics.cpp b/source/src/physics.cpp
index 7b74db80..ca1791f3 100644
--- a/source/src/physics.cpp
+++ b/source/src/physics.cpp
@@ -82,7 +82,7 @@ bool plcollide(physent *d, physent *o, float &headspace, float &hi, float &lo)
     if((d->type==ENT_PLAYER && o->type==ENT_PLAYER ? dr.sqrxy() < r*r : fabs(dr.x)<r && fabs(dr.y)<r) && dr.dotxy(d->vel) >= 0.0f)
     {
         if(d->o.z-deyeheight<o->o.z-oeyeheight) { if(o->o.z-oeyeheight<hi) hi = o->o.z-oeyeheight-1; }
-        else if(o->o.z+o->aboveeye>lo) lo = o->o.z+o->aboveeye+1;
+        else if(o->o.z+o->aboveeye>lo) lo = o->o.z+o->aboveeye;
 
         if(fabs(o->o.z-d->o.z)<o->aboveeye+deyeheight) { hitplayer = o; return true; }
         headspace = d->o.z-o->o.z-o->aboveeye-deyeheight;