1 files changed, 8 insertions, 0 deletions
diff --git a/source/sv_mvd.c b/source/sv_mvd.c
index a5d34d5..2bd373b 100644
--- a/source/sv_mvd.c
+++ b/source/sv_mvd.c
@@ -747,6 +747,12 @@ static void emit_frame( void ) {
             continue;
         }
 
+        if( newes->number != i ) {
+            Com_WPrintf( "%s: fixing ent->s.number: %d to %d\n",
+                __func__, newes->number, i );
+            newes->number = i;
+        }
+
         // calculate flags
         flags = 0;
         if( i <= sv_maxclients->integer ) {
@@ -2076,6 +2082,8 @@ static void SV_MvdRecord_f( void ) {
         case 'z':
             gzip = qtrue;
             break;
+        default:
+            return;
         }
     }