Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'revert-f27a0df8' into 'master'

Browse Source 
Revert "Merge branch 'ubruntu/trade-fix-part3' into 'master'"

See merge request veloren/veloren!2867
This commit is contained in:
Joshua Barretto 2021-09-22 12:31:49 +00:00
commit a74a40854e
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/events/invite.rs
View File

@ -218,18 +218,6 @@ pub fn handle_invite_accept(server: &mut Server, entity: specs::Entity) {
(uids.get(inviter).copied(), uids.get(entity).copied()) (uids.get(inviter).copied(), uids.get(entity).copied())
{ {
let mut trades = state.ecs().write_resource::<Trades>(); 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 id = trades.begin_trade(inviter_uid, invitee_uid);
let trade = trades.trades[&id].clone(); let trade = trades.trades[&id].clone();
if let Some(agent) = agents.get_mut(inviter) { if let Some(agent) = agents.get_mut(inviter) {