Miko/node-metaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue sending message twice, simplified paramaters

Browse Source
This commit is contained in:
hintswen
2018-11-06 16:59:37 +11:00
committed by Casper Warden
parent e52fb07720
commit 0b4960eb4f
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/classes/commands/GroupCommands.ts
View File

@@ -293,9 +293,7 @@ export class GroupCommands extends CommandsBase
});
}
async ejectFromGroupBulk(groupID: UUID | string, sendTo: {
ejecteeID: UUID | string
}[]): Promise<void>
async ejectFromGroupBulk(groupID: UUID | string, sendTo: UUID[] | string[]): Promise<void>
{
if (typeof groupID === 'string')
{
@@ -313,18 +311,16 @@ export class GroupCommands extends CommandsBase
};
msg.EjectData = [];
sendTo.forEach((to) =>
for (let ejecteeID of sendTo)
{
if (typeof to.ejecteeID === 'string')
if (typeof ejecteeID === 'string')
{
to.ejecteeID = new UUID(to.ejecteeID);
ejecteeID = new UUID(ejecteeID);
}
msg.EjectData.push({
EjecteeID: to.ejecteeID
EjecteeID: ejecteeID
});
});
this.circuit.sendMessage(msg, PacketFlags.Reliable);
};
const sequenceNo = this.circuit.sendMessage(msg, PacketFlags.Reliable);
return await this.circuit.waitForAck(sequenceNo, 10000);
@@ -332,9 +328,13 @@ export class GroupCommands extends CommandsBase
async ejectFromGroup(groupID: UUID | string, ejecteeID: UUID | string): Promise<void>
{
const sendTo = [{
ejecteeID: ejecteeID
}];
if (typeof ejecteeID === 'string')
{
ejecteeID = new UUID(ejecteeID);
}
const sendTo: UUID[] = [ejecteeID];
return await this.ejectFromGroupBulk(groupID, sendTo);
}
}