tueem/TomatenMusic-V2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dev #11

Merged
EkiciLP merged 5 commits from dev into master 2022-03-21 21:47:23 +00:00
Conversation 0 Commits 5 Files Changed 5 +11 -2
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 90514e8e62 - Show all commits

13
TomatenMusicCore/Music/GuildPlayer.cs
View File

@ -134,7 +134,6 @@ namespace TomatenMusic.Music
public async Task PlayPlaylistNowAsync(LavalinkPlaylist playlist) public async Task PlayPlaylistNowAsync(LavalinkPlaylist playlist)
{ {
EnsureConnected(); EnsureConnected();
EnsureNotDestroyed(); EnsureNotDestroyed();
if (!PlayerQueue.Queue.Any()) if (!PlayerQueue.Queue.Any())
@ -159,8 +158,16 @@ namespace TomatenMusic.Music
public async Task RewindAsync() public async Task RewindAsync()
{ {
MusicActionResponse response = PlayerQueue.Rewind(); EnsureNotDestroyed();
EnsureConnected();
if (Position.Position.Seconds < 4)
{
await ReplayAsync();
return;
}
MusicActionResponse response = PlayerQueue.Rewind();
_logger.LogInformation($"Rewinded Track {CurrentTrack.Title} for Track {response.Track.Title}"); _logger.LogInformation($"Rewinded Track {CurrentTrack.Title} for Track {response.Track.Title}");
await base.PlayAsync(response.Track); await base.PlayAsync(response.Track);
QueuePrompt.UpdateFor(GuildId); QueuePrompt.UpdateFor(GuildId);
@ -168,6 +175,8 @@ namespace TomatenMusic.Music
public async Task SkipAsync() public async Task SkipAsync()
{ {
EnsureNotDestroyed();
EnsureConnected();
MusicActionResponse response = PlayerQueue.NextTrack(true); MusicActionResponse response = PlayerQueue.NextTrack(true);
_logger.LogInformation($"Skipped Track {CurrentTrack.Title} for Track {response.Track.Title}"); _logger.LogInformation($"Skipped Track {CurrentTrack.Title} for Track {response.Track.Title}");