add stop blood api

This commit is contained in:
Huoji's
2023-10-21 16:40:37 +08:00
parent 31a3fe5428
commit d3f22fc9fc
2 changed files with 7 additions and 6 deletions

View File

@@ -45,13 +45,14 @@ void __fastcall hook_PostEventAbstract(
if (isBloodAboutMessage == false/* && isWeaponAboutMessage == false */) { if (isBloodAboutMessage == false/* && isWeaponAboutMessage == false */) {
break; break;
} }
for (uint64 i = 0; i < global::MaxPlayers; i++) // lazy fix me
for (uint64_t i = 0; i < global::MaxPlayers; i++)
{ {
if (!(*(uint64*)clients & ((uint64)1 << i))) { if (!(*(uint64_t*)clients & ((uint64_t)1 << i))) {
continue; continue;
} }
const auto pEntity = global::EntitySystem->GetBaseEntity(i); const auto pEntity = global::EntitySystem->GetBaseEntity(PlayerSlot_to_EntityIndex(i));
if (pEntity == nullptr) { if (pEntity == nullptr) {
continue; continue;
} }

View File

@@ -131,7 +131,7 @@ auto luaCall_onPlayerSpeak(int speaker, int chatType, std::string message)
lua_tostring(luaVm, -1)); lua_tostring(luaVm, -1));
lua_pop(luaVm, 1); lua_pop(luaVm, 1);
} }
if (lua_isboolean(luaVm, -1)) { if (lua_isboolean(luaVm, -1) && result == false) {
result = lua_toboolean(luaVm, -1); result = lua_toboolean(luaVm, -1);
} }
} }
@@ -231,7 +231,7 @@ auto luaCall_onPlayerTeamChange(int userid, int team, int oldteam,
lua_tostring(luaVm, -1)); lua_tostring(luaVm, -1));
lua_pop(luaVm, 1); lua_pop(luaVm, 1);
} }
if (lua_isboolean(luaVm, -1)) { if (lua_isboolean(luaVm, -1) && result == false) {
result = lua_toboolean(luaVm, -1); result = lua_toboolean(luaVm, -1);
} }
} }
@@ -279,7 +279,7 @@ auto luCall_onSayText2Filter(int player, uint64_t eMessageType,
lua_tostring(luaVm, -1)); lua_tostring(luaVm, -1));
lua_pop(luaVm, 1); lua_pop(luaVm, 1);
} }
if (lua_isboolean(luaVm, -1)) { if (lua_isboolean(luaVm, -1) && result == false) {
result = lua_toboolean(luaVm, -1); result = lua_toboolean(luaVm, -1);
} }
} }