fix conflict

.github/workflows/deploy.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12-dev"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
         target: [x86, x64]
     defaults:
       run:
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12-dev"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
         target: [x86_64, aarch64]
     defaults:
       run:
@@ -62,7 +62,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12-dev"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
         target: [x86_64, aarch64]
     defaults:
       run:

src/node/package.json

@@ -41,10 +41,5 @@
     "test": "jest",
     "universal": "napi universal",
     "version": "napi version"
-  },
-  "packageManager": "[email protected]",
-  "dependencies": {
-    "archiver": "^6.0.1",
-    "unzipper": "^0.10.14"
   }
 }

src/parser/src/parser_threads.rs

@@ -54,10 +54,12 @@ impl<'a> ParserThread<'a> {
                 DEM_Packet => self.parse_packet(&bytes, &mut buf),
                 DEM_FullPacket => {
                     match self.parse_all_packets {
-                        true => {}
+                        true => {
+                            self.parse_full_packet(&bytes, false)?;
+                        }
                         false => {
                             if self.fullpackets_parsed == 0 && started_at != 16 {
-                                self.parse_full_packet(&bytes)?;
+                                self.parse_full_packet(&bytes, true)?;
                                 self.fullpackets_parsed += 1;
                             } else {
                                 break;
@@ -125,7 +127,9 @@ impl<'a> ParserThread<'a> {
         self.net_tick = message.tick();
         Ok(())
     }
-    pub fn parse_full_packet(&mut self, bytes: &[u8]) -> Result<(), DemoParserError> {
+    pub fn parse_full_packet(&mut self, bytes: &[u8], should_parse_entities: bool) -> Result<(), DemoParserError> {
+        self.string_tables = vec![];
+
         let full_packet: CDemoFullPacket = match Message::parse_from_bytes(bytes) {
             Err(_e) => return Err(DemoParserError::MalformedMessage),
             Ok(p) => p,
@@ -161,7 +165,12 @@ impl<'a> ParserThread<'a> {
             let msg_bytes = &buf[..size as usize];
 
             let ok = match netmessage_type_from_int(msg_type as i32) {
-                svc_PacketEntities => self.parse_packet_ents(&msg_bytes),
+                svc_PacketEntities => {
+                    if should_parse_entities {
+                        self.parse_packet_ents(&msg_bytes)?;
+                    }
+                    Ok(())
+                }
                 svc_CreateStringTable => self.parse_create_stringtable(&msg_bytes),
                 svc_UpdateStringTable => self.update_string_table(&msg_bytes),
                 CS_UM_SendPlayerItemDrops => self.parse_item_drops(&msg_bytes),

src/python/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["maturin>=0.13,<0.14"]
+requires = ["maturin>=1.0,<2.0"]
 build-backend = "maturin"
 
 [project]