mirror of
https://github.com/danbulant/discord.js
synced 2026-05-25 13:02:38 +00:00
merge fix
This commit is contained in:
parent
8a2ec437e5
commit
b55e6927e9
2 changed files with 1 additions and 15 deletions
|
|
@ -1,6 +1,4 @@
|
|||
const Collection = require('../../util/Collection');
|
||||
const Constants = require('../../util/Constants');
|
||||
const Util = require('../../util/Util');
|
||||
const VoiceConnection = require('./VoiceConnection');
|
||||
|
||||
/**
|
||||
|
|
@ -36,18 +34,6 @@ class ClientVoiceManager {
|
|||
connection.channel = this.client.channels.get(channel_id);
|
||||
connection.setSessionID(session_id);
|
||||
}
|
||||
|
||||
options = Util.mergeDefault({
|
||||
guild_id: channel.guild.id,
|
||||
channel_id: channel.id,
|
||||
self_mute: false,
|
||||
self_deaf: false,
|
||||
}, options);
|
||||
|
||||
this.client.ws.send({
|
||||
op: Constants.OPCodes.VOICE_STATE_UPDATE,
|
||||
d: options,
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
2
typings
2
typings
|
|
@ -1 +1 @@
|
|||
Subproject commit 997abfd2d5b3fbc958f4cc11012a5fe41065aee8
|
||||
Subproject commit 3dbeb51fd2a0ec0ca87c4ddcf20c1c1498633762
|
||||
Loading…
Reference in a new issue