From 4e61e5a04fd22dc3fc0156d6b5b1be74b1285315 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Wed, 22 Sep 2021 11:45:54 +0000
Subject: [PATCH] Revert "Merge branch 'ubruntu/trade-fix-part3' into 'master'"

This reverts merge request !2866
---
 server/src/events/invite.rs | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/server/src/events/invite.rs b/server/src/events/invite.rs
index 1fd56d2ba5..2e08def75f 100644
--- a/server/src/events/invite.rs
+++ b/server/src/events/invite.rs
@@ -218,18 +218,6 @@ pub fn handle_invite_accept(server: &mut Server, entity: specs::Entity) {
                     (uids.get(inviter).copied(), uids.get(entity).copied())
                 {
                     let mut trades = state.ecs().write_resource::<Trades>();
-                    // check if the person that invited me has started a new trade since the
-                    // invitation was sent
-                    if trades.entity_trades.get(&inviter_uid).copied().is_some() {
-                        for client in clients.get(entity).into_iter().chain(clients.get(inviter)) {
-                            client.send_fallible(ServerGeneral::server_msg(
-                                ChatType::Meta,
-                                "Trade failed, inviter initiated new trade since sending trade \
-                                 request.",
-                            ));
-                        }
-                        return;
-                    }
                     let id = trades.begin_trade(inviter_uid, invitee_uid);
                     let trade = trades.trades[&id].clone();
                     if let Some(agent) = agents.get_mut(inviter) {