Merge branch 'master' into cached_property

Author: jordanbriere

addons/source-python/data/source-python/entities/csgo/CBaseCombatWeapon.ini

@@ -5,13 +5,13 @@ srv_check = False
 
     # _ZN17CBaseCombatWeapon13PrimaryAttackEv
     [[primary_attack]]
-        offset_linux = 316
-        offset_windows = 310
+        offset_linux = 318
+        offset_windows = 312
 
     # _ZN17CBaseCombatWeapon13SecondaryAttackEv
     [[secondary_attack]]
-        offset_linux = 317
-        offset_windows = 311
+        offset_linux = 319
+        offset_windows = 313
 
 
 [property]

addons/source-python/packages/source-python/plugins/command.py

@@ -12,6 +12,8 @@
 )
 #   Core
 from core import AutoUnload
+#   Cvars
+from cvars.public import PublicConVar
 #   Hooks
 from hooks.exceptions import except_hooks
 #   Paths
@@ -246,7 +248,7 @@ def print_plugins(self):
                 for permission, description in info.permissions:
                     message += '      {}:'.format(permission).ljust(30) + description + '\n'
 
-            if info.public_convar is not None:
+            if isinstance(info.public_convar, PublicConVar):
                 message += '   public convar:   {}\n'.format(info.public_convar.name)
 
             for attr in info.display_in_listing: