Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Play match sounds through ambient sound category #717

Merged
merged 7 commits into from
Feb 9, 2021
Merged

Play match sounds through ambient sound category #717

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
19bf2e4
Moved sound values from 1000 to 100, making values default.
benrobson Feb 3, 2021
a0ce0af
Moved all MatchResultModule sounds to AMBIENT and reset back to 1000.
benrobson Feb 8, 2021
4280716
Move all CTW sounds to AMBIENT.
benrobson Feb 8, 2021
2c70995
Move DTM sound out of MASTER and into AMBIENT.
benrobson Feb 8, 2021
a271e28
Moved Death sounds to AMBIENT.
benrobson Feb 8, 2021
2245b44
Undo Death sounds moving to AMBIENT.
benrobson Feb 8, 2021
81c7cf7
Move KOTH Control Point sounds to AMBIENT.
benrobson Feb 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions TGM/src/main/java/network/warzone/tgm/modules/MatchResultModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,19 @@ public void onMatchResult(MatchResultEvent event) {
Location location = player.getLocation().clone().add(0.0, 100.0, 0.0);

if (spectators.containsPlayer(player)) {
player.playSound(location, Sound.ENTITY_WITHER_DEATH, 1000, 1);
player.playSound(location, Sound.ENTITY_WITHER_DEATH, 100, 1);
} else {
applyPostPlayer(player);

if (event.getWinningTeam() == null) {
player.sendTitle("", ChatColor.YELLOW + "The result was a tie!", 10, 40, 10);
player.playSound(location, Sound.ENTITY_WITHER_SPAWN, 1000, 1);
player.playSound(location, Sound.ENTITY_WITHER_SPAWN, 100, 1);
} else if (event.getWinningTeam().containsPlayer(player)) {
player.sendTitle("", ChatColor.GREEN + "Your team won!", 10, 40, 10);
player.playSound(location, Sound.ENTITY_WITHER_DEATH, 1000, 1);
player.playSound(location, Sound.ENTITY_WITHER_DEATH, 100, 1);
} else {
player.sendTitle("", ChatColor.RED + "Your team lost!", 10, 40, 10);
player.playSound(location, Sound.ENTITY_WITHER_SPAWN, 1000, 1);
player.playSound(location, Sound.ENTITY_WITHER_SPAWN, 100, 1);
}
}

Expand Down