Skip to content

Commit 7de5f55

Browse files
authored
Merge pull request #78 from Fish-Community/spentcud-VNW
make VNW send all the waves it skips
2 parents 85676e7 + 861f63e commit 7de5f55

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build/scripts/playerCommands.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/playerCommands.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ Please stop attacking and [lime]build defenses[] first!`
626626
handler({allCommands, sender, args:{force = true}}){
627627
if(allCommands.vnw.data.manager.session == null){
628628
if(force == false) fail(`Cannot clear votes for VNW because no vote is currently ongoing.`);
629-
skipWaves(1, false);
629+
skipWaves(1, true);
630630
} else {
631631
if(force) Call.sendMessage(`VNW: [green]Vote was forced by admin [yellow]${sender.name}[green], skipping wave.`);
632632
else Call.sendMessage(`VNW: [red]Votes cleared by admin [yellow]${sender.name}[red].`);
@@ -641,7 +641,7 @@ Please stop attacking and [lime]build defenses[] first!`
641641
perm: Perm.play,
642642
init: () => ({
643643
manager: new VoteManager<number>(1.5 * 60_000)
644-
.on("success", (t) => skipWaves(t.session!.data - 1, false))
644+
.on("success", (t) => skipWaves(t.session!.data, true))
645645
.on("vote passed", () => Call.sendMessage('VNW: [green]Vote passed, skipping to next wave.'))
646646
.on("vote failed", () => Call.sendMessage('VNW: [red]Vote failed.'))
647647
.on("player vote change", (t, player) => Call.sendMessage(`VNW: ${player.name} [white] has voted on skipping [accent]${t.session!.data}[white] wave(s). [green]${t.currentVotes()}[white] votes, [green]${t.requiredVotes()}[white] required.`))

0 commit comments

Comments
 (0)