Merge remote-tracking branch 'origin/master'

Jire · Dec 17, 2020 · 6e33919 · 6e33919
2 parents c897a86 + 87e3f65
commit 6e33919
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/main/kotlin/com/charlatano/game/entity/EntityType.kt b/src/main/kotlin/com/charlatano/game/entity/EntityType.kt
@@ -134,6 +134,7 @@ enum class EntityType(val weapon: Boolean = false, val grenade: Boolean = false)
 	CKnife,
 	CKnifeGG,
 	CLightGlow,
+	CMapVetoPickController,
 	CMaterialModifyControl,
 	CMelee,
 	CMolotovGrenade(grenade = true),