added new hook, handler and dispatcher for any damage events happening #120
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… in minqlx plugins
better filter potential players by the entity_id in range(0, 64) (MAX_PLAYERS = 64 in ql source). Otherwise you will get dmg events from stuff like crushers, lava, trigger_hurt trying to be converted into a player that obviously does not exist.
em92
requested changes
Aug 13, 2023
hooks.c
Outdated
| return; | ||
| } | ||
|
|
||
| target_id = target->client->ps.clientNum; |
There was a problem hiding this comment.
if target->client is spectating, ps.clientNum is the player who is being spectated.
hooks.c
Outdated
| target_id = target->client->ps.clientNum; | ||
|
|
||
| if (attacker && attacker->client) { | ||
| attacker_id = attacker->client->ps.clientNum; |
python/minqlx/_handlers.py
Outdated
Comment on lines
436
to
437
| target_player = minqlx.Player(target_id) if target_id in range(0, 64) else None | ||
| inflictor_player = minqlx.Player(attacker_id) if attacker_id is not None and attacker_id in range(0, 64) else None |
There was a problem hiding this comment.
There is no need check validity of target_id and attacker_id. My_G_Damage is expected to pass valid ids
python_embed.c
Outdated
Comment on lines
124
to
127
| {"is_chatting", "Whether the player is currently chatting."}, | ||
| {"is_frozen", "Whether the player is frozen(freezetag)."}, | ||
| {NULL} | ||
| }; |
python_embed.c
Outdated
Comment on lines
765
to
766
| PyStructSequence_SetItem(state, 12, PyBool_FromLong(g_entities[client_id].client->ps.eFlags & EF_TALK != 0)); | ||
| PyStructSequence_SetItem(state, 13, PyBool_FromLong(g_entities[client_id].client->ps.pm_type == 4)); |
python_embed.c
Outdated
Comment on lines
1508
to
1513
| #if PY_VERSION_HEX < ((3 << 24) | (7 << 16)) | ||
| char *entity_classname = NULL, *item_classname = NULL; | ||
| #else | ||
| const char *entity_classname = NULL, *item_classname = NULL; | ||
| #endif | ||
| gentity_t* ent; |
python_embed.c
Outdated
Comment on lines
1934
to
1936
| #if PY_VERSION_HEX < ((3 << 24) | (7 << 16)) | ||
| PyEval_InitThreads(); | ||
| #endif |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I hooked into G_Damage and forwarded that towards python, so that python plugins now can self.add_hook("damage", self.handle_damage) in its own function. The plugin function gets
The events can't be stopped, and are delivered regardless of whether the target actually gets health/armor reduced, i.e. from rocket jumps with DAMAGE_NO_PROTECTION not set, or team damage in the DAMAGE_NO_TEAM_PROTECTION case. You can detect harmful team shots by this. Plugins would need to filter the events they are interested in on their own.