Skip to content

Commit 8c109d4

Browse files
committed
fix(events): Return from scripting
1 parent 1b9538b commit 8c109d4

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/core/entrypoint.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ bool OnClientCommand(int playerid, std::string command)
243243
bool response = true;
244244
try
245245
{
246-
response = std::any_cast<bool>(data.GetData<std::any>("event_return"));
246+
response = std::any_cast<bool>(data.GetAnyData("event_return"));
247247
}
248248
catch (std::bad_any_cast& e)
249249
{

src/plugins/manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ EXT_API int swiftly_TriggerEvent(const char* ext_name, const char* evName, void*
214214
{
215215
ClassData data({ { "plugin_name", std::string(ext_name) } }, "Event", nullptr);
216216
auto result = g_pluginManager.ExecuteEvent(ext_name, evName, *(std::vector<std::any>*)args, &data);
217-
*reinterpret_cast<std::any*>(eventReturn) = data.GetData<std::any>("event_return");
217+
*reinterpret_cast<std::any*>(eventReturn) = data.GetAnyData("event_return");
218218

219219
return (int)result;
220220
}

src/scripting/engine/gameevents.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ bool OnClientChat(int playerid, std::string text, bool teamonly)
3232
bool response = true;
3333
try
3434
{
35-
response = std::any_cast<bool>(data.GetData<std::any>("event_return"));
35+
response = std::any_cast<bool>(data.GetAnyData("event_return"));
3636
}
3737
catch (std::bad_any_cast& e)
3838
{
@@ -55,7 +55,7 @@ dyno::ReturnAction Hook_CGameRules_TerminateRound(dyno::CallbackType type, dyno:
5555
bool response = true;
5656
try
5757
{
58-
response = std::any_cast<bool>(data.GetData<std::any>("event_return"));
58+
response = std::any_cast<bool>(data.GetAnyData("event_return"));
5959
}
6060
catch (std::bad_any_cast& e)
6161
{
@@ -81,7 +81,7 @@ dyno::ReturnAction Hook_CEntityIdentity_AcceptInput(dyno::CallbackType type, dyn
8181
bool response = true;
8282
try
8383
{
84-
response = std::any_cast<bool>(data.GetData<std::any>("event_return"));
84+
response = std::any_cast<bool>(data.GetAnyData("event_return"));
8585
}
8686
catch (std::bad_any_cast& e)
8787
{
@@ -123,7 +123,7 @@ dyno::ReturnAction Hook_CBaseEntity_TakeDamage(dyno::CallbackType type, dyno::IH
123123
bool response = true;
124124
try
125125
{
126-
response = std::any_cast<bool>(data.GetData<std::any>("event_return"));
126+
response = std::any_cast<bool>(data.GetAnyData("event_return"));
127127
}
128128
catch (std::bad_any_cast& e)
129129
{

src/server/player/manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ bool PlayerManager::ClientConnect(CPlayerSlot slot, const char* pszName, uint64
123123
bool response = true;
124124
try
125125
{
126-
response = std::any_cast<bool>(data.GetData<std::any>("event_return"));
126+
response = std::any_cast<bool>(data.GetAnyData("event_return"));
127127
}
128128
catch (std::bad_any_cast& e)
129129
{

0 commit comments

Comments
 (0)