Merge branch 'master' of https://github.com/Source-Python-Dev-Team/Source.Python

Author: Ayuto

addons/source-python/data/source-python/entities/orangebox/CBasePlayer.ini

@@ -1,12 +1,12 @@
 [function]
 
     [[increment_frag_count]]
-        identifier_windows = 55 8B EC 8B 45 08 01 81 68 0E 00 00
+        identifier_windows = 55 8B EC 8B 45 08 01 81 38 0E 00 00
         identifier_linux = _ZN11CBasePlayer18IncrementFragCountEi
         arguments = INT
 
     [[increment_death_count]]
-        identifier_windows = 55 8B EC 8B 45 08 01 81 6C 0E 00 00
+        identifier_windows = 55 8B EC 8B 45 08 01 81 3C 0E 00 00
         identifier_linux = _ZN11CBasePlayer19IncrementDeathCountEi
         arguments = INT
 

addons/source-python/data/source-python/entities/orangebox/cstrike/CCSPlayer.ini

@@ -1,7 +1,7 @@
 [function]
 
     [[add_account]]
-        identifier_windows = 55 8B EC 83 EC 20 89 4D FC 8D 45 08
+        identifier_windows = 55 8B EC 83 EC 18 89 4D FC 8D 45 08
         identifier_linux = _ZN9CCSPlayer10AddAccountEibbPKc
         arguments = INT, BOOL, BOOL, STRING
 

src/core/modules/entities/entities.h

@@ -103,7 +103,7 @@ class TakeDamageInfoBaseWrapper: public CTakeDamageInfo
 	void set_inflictor(unsigned int uiInflictor)
 	{
 #if defined(ENGINE_ORANGEBOX)
-		m_hInflictor = EHANDLE::UnsafeFromIndex(uiInflictor);
+		m_hInflictor = EHANDLE::UnsafeFromBaseHandle(ExcBaseHandleFromIndex(uiInflictor));
 #else
 		m_hInflictor = ExcBaseHandleFromIndex(uiInflictor);
 #endif
@@ -148,7 +148,7 @@ class TakeDamageInfoBaseWrapper: public CTakeDamageInfo
 			m_CSGOAttacker.m_iUserId = -1;
 		}
 #elif defined(ENGINE_ORANGEBOX)
-		m_hAttacker = EHANDLE::UnsafeFromIndex(uiAttacker);
+		m_hAttacker = EHANDLE::UnsafeFromBaseHandle(ExcBaseHandleFromIndex(uiAttacker));
 #else
 		m_hAttacker = ExcBaseHandleFromIndex(uiAttacker);
 #endif
@@ -179,7 +179,7 @@ class TakeDamageInfoBaseWrapper: public CTakeDamageInfo
 	void set_weapon(unsigned int uiWeapon)
 	{
 #if defined(ENGINE_ORANGEBOX)
-		m_hWeapon = EHANDLE::UnsafeFromIndex(uiWeapon);
+		m_hWeapon = EHANDLE::UnsafeFromBaseHandle(ExcBaseHandleFromIndex(uiWeapon));
 #else
 		m_hWeapon = ExcBaseHandleFromIndex(uiWeapon);
 #endif