From a2764247492823c3ad76ab0bee38b38cfc1cbc7d Mon Sep 17 00:00:00 2001 From: HumanoidSandvichDispenser Date: Tue, 27 Jun 2023 20:29:04 -0700 Subject: [PATCH] fix weapon breaking when hitting dead enemy --- BoundingBoxes/Hurtbox.cs | 15 +++++++++------ SupaLidlGame.csproj | 2 +- project.godot | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/BoundingBoxes/Hurtbox.cs b/BoundingBoxes/Hurtbox.cs index ca36c51..f9e6c4f 100644 --- a/BoundingBoxes/Hurtbox.cs +++ b/BoundingBoxes/Hurtbox.cs @@ -29,11 +29,14 @@ public partial class Hurtbox : BoundingBox, IFaction Vector2 knockbackOrigin = default, Vector2 knockbackVector = default) { - EmitSignal( - SignalName.ReceivedDamage, - damage, - inflictor, - knockback, - knockbackOrigin, knockbackVector); + if (inflictor is not null) + { + EmitSignal( + SignalName.ReceivedDamage, + damage, + inflictor, + knockback, + knockbackOrigin, knockbackVector); + } } } diff --git a/SupaLidlGame.csproj b/SupaLidlGame.csproj index 44aa4a6..e7f1627 100644 --- a/SupaLidlGame.csproj +++ b/SupaLidlGame.csproj @@ -1,4 +1,4 @@ - + net6.0 true diff --git a/project.godot b/project.godot index e28b7f9..8bdfda5 100644 --- a/project.godot +++ b/project.godot @@ -47,13 +47,13 @@ ui_down={ } roll={ "deadzone": 0.5, -"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":3,"canceled":false,"pressed":false,"double_click":false,"script":null) +"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":3,"pressed":false,"double_click":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":0,"echo":false,"script":null) ] } attack1={ "deadzone": 0.5, -"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null) +"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"pressed":false,"double_click":false,"script":null) ] } equip={