don't always fallback to blue team

demostf · Mar 8, 2018 · a1bba89 · a1bba89
1 parent 56442ca
commit a1bba89
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/src/PacketHandler/HL2DMEntityHandler.ts b/src/PacketHandler/HL2DMEntityHandler.ts
@@ -36,7 +36,7 @@ export function handleHL2DMEntity(entity: PacketEntity, match: Match, message: P
 				const propName = prop.definition.ownerTableName + '.' + prop.definition.name;
 				switch (propName) {
 					case 'DT_BaseEntity.m_iTeamNum':
-						if (!player.user.team) {
+						if (!player.user.team && (prop.value === 2 || prop.value === 3)) {
 							player.user.team = prop.value === 2 ? 'red' : 'blue';
 						}
 					case 'DT_BasePlayer.m_iHealth':

diff --git a/src/tests/data/hl2dm_2v2.json b/src/tests/data/hl2dm_2v2.json
@@ -158,8 +158,7 @@
       "classes": {},
       "name": " eFPS | SourceTV | NA #3",
       "steamId": "BOT",
-      "userId": 2,
-      "team": "blue"
+      "userId": 2
     },
     "23": {
       "classes": {},

diff --git a/src/tests/data/hl2dm_ffa.json b/src/tests/data/hl2dm_ffa.json
@@ -154,22 +154,19 @@
       "classes": {},
       "name": " eFPS | SourceTV | NA #1",
       "steamId": "BOT",
-      "userId": 2,
-      "team": "blue"
+      "userId": 2
     },
     "115": {
       "classes": {},
       "name": "[VDuS] Carbon",
       "steamId": "[U:1:52900516]",
-      "userId": 115,
-      "team": "blue"
+      "userId": 115
     },
     "116": {
       "classes": {},
       "name": "SE.Hammarn",
       "steamId": "[U:1:10585582]",
-      "userId": 116,
-      "team": "blue"
+      "userId": 116
     }
   },
   "deaths": [