YourWishes/Dawn-Godot
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fixed last bugs

Browse Source
This commit is contained in:
Dominic Masters
2025-05-12 21:02:55 -05:00
parent a575b8a47d
commit 54feb2ce55
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/Entity/BasicNPCEntity.gd
View File

@@ -7,10 +7,16 @@ func _ready() -> void:
self.onEntityInteract self.onEntityInteract
) )
func _exit_tree() -> void:
$Entity/EntityInteractable.onInteract.disconnect(
self.onEntityInteract
)
func onEntityInteract( func onEntityInteract(
interactor:EntityInteractor, interactor:EntityInteractor,
interactee:EntityInteractable interactee:EntityInteractable
) -> void: ) -> void:
if interactEvent == null || interactEvent.started: if interactEvent == null || (interactEvent.started && !interactEvent.isDone()):
return return
interactEvent.onEntityInteract(interactor, $Entity/EntityInteractable) interactEvent.onEntityInteract(interactor, $Entity/EntityInteractable)

1
scripts/Entity/Component/EntityInteractor.gd
View File

@@ -14,7 +14,6 @@ enum InteractorType {
func interactWith(interactable:EntityInteractable) -> void: func interactWith(interactable:EntityInteractable) -> void:
interactable.interact(self) interactable.interact(self)
pass
func getRaycastInteractable() -> EntityInteractable: func getRaycastInteractable() -> EntityInteractable:
if !entityDirection or !characterBody: if !entityDirection or !characterBody: