Skip to content

Commit 9a27916

Browse files
committed
Fix interruption logic
1 parent 67c99b7 commit 9a27916

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/main/java/net/clementraynaud/skoice/tasks/InterruptSystemTask.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
3131
import org.bukkit.Bukkit;
3232

33+
import java.util.List;
34+
3335
public class InterruptSystemTask {
3436

3537
private final Skoice plugin;
@@ -56,10 +58,11 @@ public void run() {
5658
|| this.plugin.getBot().getJDA().getSelfUser().isMfaEnabled())) {
5759
VoiceChannel voiceChannel = this.plugin.getConfigYamlFile().getVoiceChannel();
5860
for (ProximityChannel proximityChannel : ProximityChannels.getInitialized()) {
59-
if (voiceChannel != null) {
60-
for (int i = 0; i < proximityChannel.getChannel().getMembers().size(); i++) {
61-
Member member = proximityChannel.getChannel().getMembers().get(i);
62-
if (i + 1 < proximityChannel.getChannel().getMembers().size()) {
61+
List<Member> members = proximityChannel.getChannel().getMembers();
62+
if (voiceChannel != null && !members.isEmpty()) {
63+
for (int i = 0; i < members.size(); i++) {
64+
Member member = members.get(i);
65+
if (i + 1 < members.size()) {
6366
member.getGuild()
6467
.moveVoiceMember(member, voiceChannel)
6568
.queue();
@@ -74,6 +77,8 @@ public void run() {
7477
proximityChannel.delete();
7578
}
7679
}
80+
} else {
81+
proximityChannel.delete();
7782
}
7883
}
7984

0 commit comments

Comments
 (0)