Improved performance of Entity.create, find and find_or_create by mov…

…ing them to BaseEntity directly.

addons/source-python/packages/source-python/entities/_base.py

@@ -282,58 +282,6 @@ def __dir__(self):
         # Return a sorted list of attributes
         return sorted(attributes)
 
-    @classmethod
-    def create(cls, classname):
-        """Create a new networked entity with the given classname.
-
-        :param str classname:
-            Classname of the entity to create.
-        :raise ValueError:
-            Raised if the given classname is not a networked entity.
-        """
-        entity = BaseEntity.create(classname)
-        if entity.is_networked():
-            return cls(entity.index)
-
-        entity.remove()
-        raise ValueError('"{}" is not a networked entity.'.format(classname))
-
-    @classmethod
-    def find(cls, classname):
-        """Try to find an entity with the given classname.
-
-        If not entity has been found, None will be returned.
-
-        :param str classname:
-            The classname of the entity.
-        :return:
-            Return the found entity.
-        :rtype: Entity
-        """
-        entity = BaseEntity.find(classname)
-        if entity is not None and entity.is_networked():
-            return cls(entity.index)
-
-        return None
-
-    @classmethod
-    def find_or_create(cls, classname):
-        """Try to find an entity with the given classname.
-
-        If no entity has been found, it will be created.
-
-        :param str classname:
-            The classname of the entity.
-        :return:
-            Return the found or created entity.
-        :rtype: Entity
-        """
-        entity = cls.find(classname)
-        if entity is None:
-            entity = cls.create(classname)
-
-        return entity
-
     @classmethod
     def from_inthandle(cls, inthandle, caching=None):
         """Create an entity instance from an inthandle.
@@ -346,10 +294,10 @@ def from_inthandle(cls, inthandle, caching=None):
         """
         return cls(index_from_inthandle(inthandle), caching=caching)
 
-    @classmethod
-    def _obj(cls, ptr):
-        """Return an entity instance of the given pointer."""
-        return cls(index_from_pointer(ptr))
+    # @classmethod
+    # def _obj(cls, ptr):
+        # """Return an entity instance of the given pointer."""
+        # return cls(index_from_pointer(ptr))
 
     def is_networked(self):
         """Return True if the entity is networked.

src/core/modules/entities/entities_entity.cpp

@@ -73,6 +73,28 @@ CBaseEntity* CBaseEntityWrapper::create(const char* name)
 	return pEntity->GetBaseEntity();
 }
 
+object CBaseEntityWrapper::create(object cls, const char *name)
+{
+	object entity = object();
+	CBaseEntityWrapper *pEntity = (CBaseEntityWrapper *)create(name);
+	try
+	{
+		entity = cls(pEntity->GetIndex());
+	}
+	catch (...)
+	{
+		pEntity->remove();
+
+		const char *classname = extract<const char *>(cls.attr("__qualname__"));
+		BOOST_RAISE_EXCEPTION(
+			PyExc_ValueError,
+			"Unable to make a '%s' instance out of this '%s' entity.",
+			classname, name
+		)
+	}
+	return entity;
+}
+
 CBaseEntity* CBaseEntityWrapper::find(const char* name)
 {
 	CBaseEntity* pEntity = (CBaseEntity *) servertools->FirstEntity();
@@ -86,6 +108,19 @@ CBaseEntity* CBaseEntityWrapper::find(const char* name)
 	return NULL;
 }
 
+object CBaseEntityWrapper::find(object cls, const char *name)
+{
+	try
+	{
+		return cls(((CBaseEntityWrapper *)find(name))->GetIndex());
+	}
+	catch (...)
+	{
+		PyErr_Clear();
+	}
+	return object();
+}
+
 CBaseEntity* CBaseEntityWrapper::find_or_create(const char* name)
 {
 	CBaseEntity* entity = find(name);
@@ -95,6 +130,15 @@ CBaseEntity* CBaseEntityWrapper::find_or_create(const char* name)
 	return entity;
 }
 
+object CBaseEntityWrapper::find_or_create(object cls, const char *name)
+{
+	object entity = find(cls, name);
+	if (entity.is_none())
+		return create(cls, name);
+
+	return entity;
+}
+
 CBaseEntityOutputWrapper* CBaseEntityWrapper::get_output(const char* name)
 {
 	// TODO: Caching?

src/core/modules/entities/entities_entity.h

@@ -96,8 +96,11 @@ class CBaseEntityWrapper: public IServerEntity
 	static boost::shared_ptr<CBaseEntityWrapper> __init__(unsigned int uiEntityIndex);
 	static boost::shared_ptr<CBaseEntityWrapper> wrap(CBaseEntity* pEntity);
 	static CBaseEntity* create(const char* name);
+	static object create(object cls, const char* name);
 	static CBaseEntity* find(const char* name);
+	static object find(object cls, const char* name);
 	static CBaseEntity* find_or_create(const char* name);
+	static object find_or_create(object cls, const char* name);
 
 	CBaseEntityOutputWrapper* get_output(const char* name);
 	static IEntityFactory* get_factory(const char* name);

src/core/modules/entities/entities_entity_wrap.cpp

@@ -72,26 +72,29 @@ void export_base_entity(scope _entity)
 		"Return True if both entities are the same."
 	);
 
-	BaseEntity.def("create",
-		&CBaseEntityWrapper::create,
-		return_by_value_policy(),
+	CLASSMETHOD(
+		BaseEntity, 
+		"create", 
+		GET_FUNCTION(object, CBaseEntityWrapper::create, object, const char *),
 		"Create an entity by its class name.\n\n"
 		":rtype: BaseEntity"
-	).staticmethod("create");
+	);
 
-	BaseEntity.def("find",
-		&CBaseEntityWrapper::find,
-		return_by_value_policy(),
+	CLASSMETHOD(
+		BaseEntity,
+		"find",
+		GET_FUNCTION(object, CBaseEntityWrapper::find, object, const char *),
 		"Return the first entity that has a matching class name.\n\n"
 		":rtype: BaseEntity"
-	).staticmethod("find");
+	);
 
-	BaseEntity.def("find_or_create",
-		&CBaseEntityWrapper::find_or_create,
-		return_by_value_policy(),
+	CLASSMETHOD(
+		BaseEntity,
+		"find_or_create",
+		GET_FUNCTION(object, CBaseEntityWrapper::find_or_create, object, const char *),
 		"Try to find an entity that has a matching class name. If no entity has been found, it will be created.\n\n"
 		":rtype: BaseEntity"
-	).staticmethod("find_or_create");
+	);
 
 	// Others
 	BaseEntity.def("is_player",