From 9df38d595203bd12994e22ffd6a617ce89fe77d1 Mon Sep 17 00:00:00 2001
From: cha0s <git@cha0s.io>
Date: Thu, 5 Sep 2024 16:52:22 -0500
Subject: [PATCH] fix: merge

---
 app/ecs/components/emitter.js      | 2 +-
 app/ecs/components/interlocutor.js | 2 +-
 app/ecs/components/sound.js        | 2 +-
 app/ecs/components/vulnerable.js   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/ecs/components/emitter.js b/app/ecs/components/emitter.js
index 3186053..28ada13 100644
--- a/app/ecs/components/emitter.js
+++ b/app/ecs/components/emitter.js
@@ -38,7 +38,7 @@ export default class EmitterComponent extends Component {
   }
   mergeDiff(original, update) {
     const merged = {};
-    if (update.emit) {
+    if (original.emit || update.emit) {
       merged.emit = {
         ...original.emit,
         ...update.emit,
diff --git a/app/ecs/components/interlocutor.js b/app/ecs/components/interlocutor.js
index 881e6fa..0c00ab6 100644
--- a/app/ecs/components/interlocutor.js
+++ b/app/ecs/components/interlocutor.js
@@ -3,7 +3,7 @@ import Component from '@/ecs/component.js';
 export default class Interlocutor extends Component {
   mergeDiff(original, update) {
     const merged = {};
-    if (update.dialogue) {
+    if (original.dialogue || update.dialogue) {
       merged.dialogue = {
         ...original.dialogue,
         ...update.dialogue,
diff --git a/app/ecs/components/sound.js b/app/ecs/components/sound.js
index 590bacc..0a6d27b 100644
--- a/app/ecs/components/sound.js
+++ b/app/ecs/components/sound.js
@@ -3,7 +3,7 @@ import Component from '@/ecs/component.js';
 export default class Sound extends Component {
   mergeDiff(original, update) {
     const merged = {};
-    if (update.play) {
+    if (original.play || update.play) {
       merged.play = [
         ...(original.play ?? []),
         ...update.play,
diff --git a/app/ecs/components/vulnerable.js b/app/ecs/components/vulnerable.js
index 2bf5829..a2b078d 100644
--- a/app/ecs/components/vulnerable.js
+++ b/app/ecs/components/vulnerable.js
@@ -9,7 +9,7 @@ export const DamageTypes = {
 export default class Vulnerable extends Component {
   mergeDiff(original, update) {
     const merged = {};
-    if (update.damage) {
+    if (original.damage || update.damage) {
       merged.damage = {
         ...original.damage,
         ...update.damage,