diff --git a/common/src/comp/controller.rs b/common/src/comp/controller.rs index 542b66f9f5..59425332d7 100644 --- a/common/src/comp/controller.rs +++ b/common/src/comp/controller.rs @@ -288,6 +288,10 @@ impl Controller { self.push_event(ControlEvent::InviteResponse(invite_response)); } + pub fn push_initiate_invite(&mut self, uid: Uid, invite: InviteKind) { + self.push_event(ControlEvent::InitiateInvite(uid, invite)); + } + pub fn push_action(&mut self, action: ControlAction) { self.actions.push(action); } pub fn push_basic_input(&mut self, input: InputKind) { diff --git a/server/src/sys/agent.rs b/server/src/sys/agent.rs index 787e41faa7..7db3f71df8 100644 --- a/server/src/sys/agent.rs +++ b/server/src/sys/agent.rs @@ -1015,10 +1015,7 @@ impl<'a> AgentData<'a> { self.chat_npc(msg, event_emitter); } else if agent.behavior.can_trade() { if !agent.behavior.is(BehaviorState::TRADING) { - controller.push_event(ControlEvent::InitiateInvite( - by, - InviteKind::Trade, - )); + controller.push_initiate_invite(by, InviteKind::Trade); self.chat_npc( "npc.speech.merchant_advertisement", event_emitter, @@ -1036,10 +1033,7 @@ impl<'a> AgentData<'a> { Subject::Trade => { if agent.behavior.can_trade() { if !agent.behavior.is(BehaviorState::TRADING) { - controller.push_event(ControlEvent::InitiateInvite( - by, - InviteKind::Trade, - )); + controller.push_initiate_invite(by, InviteKind::Trade); self.chat_npc( "npc.speech.merchant_advertisement", event_emitter,