jsza
diff --git a/‎addons/source-python/packages/source-python/entities/specials.py‎
Lines changed: 1 addition & 6 deletions b/‎addons/source-python/packages/source-python/entities/specials.py‎
Lines changed: 1 addition & 6 deletions
diff --git a/‎src/core/modules/memory/memory_function.cpp‎
Lines changed: 8 additions & 0 deletions b/‎src/core/modules/memory/memory_function.cpp‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/core/modules/memory/memory_function.h‎
Lines changed: 1 addition & 0 deletions b/‎src/core/modules/memory/memory_function.h‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/core/modules/memory/memory_wrap.cpp‎
Lines changed: 5 additions & 0 deletions b/‎src/core/modules/memory/memory_wrap.cpp‎
Lines changed: 5 additions & 0 deletions
@@ -138,11 +138,6 @@ def take_damage(
             setattr(take_damage_info, item, kwargs[item])
 
         if skip_hooks:
-            try:
-                # Try calling the trampoline
-                self.on_take_damage.call_trampoline(take_damage_info)
-            except ValueError:
-                # If it failed, the function probably wasn't hooked
-                self.on_take_damage(take_damage_info)
+            self.on_take_damage.skip_hooks(take_damage_info)
         else:
             self.on_take_damage(take_damage_info)
@@ -278,6 +278,14 @@ object CFunction::CallTrampoline(tuple args, dict kw)
 		m_iCallingConvention, m_pCallingConvention, m_tArgs, m_eReturnType, m_oConverter).Call(args, kw);
 }
 
+object CFunction::SkipHooks(tuple args, dict kw)
+{
+	if (IsHooked())
+		return CallTrampoline(args, kw);
+
+	return Call(args, kw);
+}
+
 handle<> CFunction::AddHook(HookType_t eType, PyObject* pCallable)
 {
 	if (!IsHookable())
 
@@ -67,6 +67,7 @@ class CFunction: public CPointer
 
 	object Call(boost::python::tuple args, dict kw);
 	object CallTrampoline(boost::python::tuple args, dict kw);
+	object SkipHooks(boost::python::tuple args, dict kw);
 
 	handle<> AddHook(HookType_t eType, PyObject* pCallable);
 	void RemoveHook(HookType_t eType, PyObject* pCallable);
 
@@ -436,6 +436,11 @@ void export_function(scope _memory)
 			"Calls the trampoline function dynamically."
 		)
 
+		.def("skip_hooks",
+			raw_method(&CFunction::SkipHooks),
+			"Call the function, but skip hooks if there are any."
+		)
+
 		.def("add_hook",
 			&CFunction::AddHook,
 			"Adds a hook callback.",
Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,14 @@ object CFunction::CallTrampoline(tuple args, dict kw)`
`278`	`278`	`m_iCallingConvention, m_pCallingConvention, m_tArgs, m_eReturnType, m_oConverter).Call(args, kw);`
`279`	`279`	`}`
`280`	`280`
	`281`	`+object CFunction::SkipHooks(tuple args, dict kw)`
	`282`	`+{`
	`283`	`+ if (IsHooked())`
	`284`	`+ return CallTrampoline(args, kw);`
	`285`	`+`
	`286`	`+ return Call(args, kw);`
	`287`	`+}`
	`288`	`+`
`281`	`289`	`handle<> CFunction::AddHook(HookType_t eType, PyObject* pCallable)`
`282`	`290`	`{`
`283`	`291`	`if (!IsHookable())`