Skip to content

chore(BaseEnemy): apply_damage passes null as attacker, losing log context #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
niyazmft merged 2 commits into from
Jun 8, 2026
Merged

chore(BaseEnemy): apply_damage passes null as attacker, losing log context #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f97fc04
chore(BaseEnemy): apply_damage passes null as attacker, losing log co…
google-labs-jules[bot] Jun 8, 2026
cd5247c
Merge branch 'main' into chore/base-enemy-apply-damage-attacker-conte…
niyazmft Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/entities/base_enemy.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,11 @@ func _handle_attack(action: Dictionary) -> void:


## Damage API
func apply_damage(damage: int) -> void:
func apply_damage(damage: int, attacker: Entity = null) -> void:
## Apply damage through EntityLifecycle via AutoloadHelper
var lifecycle: _EntityLifecycle = AutoloadHelper.entity_lifecycle()
if lifecycle:
lifecycle.apply_damage(null, entity, damage)
lifecycle.apply_damage(attacker, entity, damage)
else:
entity.apply_damage(damage)

Expand Down
4 changes: 2 additions & 2 deletions scripts/entities/keeper.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ func trigger_damage_effect() -> void:

## Apply damage to the Keeper entity and trigger recoil on the apparition.
## Delegates to EntityLifecycle for canonical state transitions.
func apply_damage(damage: int) -> void:
func apply_damage(damage: int, attacker: Entity = null) -> void:
if entity == null:
return
var lifecycle: _EntityLifecycle = AutoloadHelper.entity_lifecycle()
if lifecycle:
lifecycle.apply_damage(null, entity, damage)
lifecycle.apply_damage(attacker, entity, damage)
else:
entity.apply_damage(damage)

Expand Down
Loading