From 670d59cce3e9eb8fff3bc306f3105fb90da5b19e Mon Sep 17 00:00:00 2001 From: vddcore <573729-vddcore@users.noreply.gitlab.com> Date: Fri, 8 Jul 2022 10:31:55 +0000 Subject: [PATCH] Fixed the duplicated sound effects when cutting trees --- .../woodcutting/WoodcuttingSkillPulse.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java b/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java index 0090b46e7..0056bf2aa 100644 --- a/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java @@ -21,6 +21,7 @@ import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; import core.tools.RandomFunction; +import org.rs09.consts.Sounds; import rs09.game.node.entity.skill.farming.FarmingPatch; import rs09.game.node.entity.skill.farming.Patch; import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks; @@ -37,7 +38,13 @@ import static rs09.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_ * @author ceik */ public class WoodcuttingSkillPulse extends Pulse { - private int[] woodcuttingSounds = { 3038, 3039, 3040, 3041, 3042 }; + private int[] woodcuttingSounds = { + Sounds.WOODCUTTING_HIT_3038, + Sounds.WOODCUTTING_HIT_3039, + Sounds.WOODCUTTING_HIT_3040, + Sounds.WOODCUTTING_HIT_3041, + Sounds.WOODCUTTING_HIT_3042 + }; private WoodcuttingNode resource; private int ticks; @@ -109,7 +116,11 @@ public class WoodcuttingSkillPulse extends Pulse { if(!player.getAnimator().isAnimating()) { player.animate(SkillingTool.getHatchet(player).getAnimation()); - List playersAroundMe = RegionManager.getSurroundingPlayers(player); + List playersAroundMe = RegionManager.getLocalPlayers(player, 2) + .stream() + .filter(p -> !p.getUsername().equals(player.getUsername())) + .collect(Collectors.toList()); + int soundIndex = RandomFunction.random(0, woodcuttingSounds.length); player.getAudioManager().send( @@ -207,8 +218,7 @@ public class WoodcuttingSkillPulse extends Pulse { } node.setActive(false); - // TODO: Extract this someplace appropriate. - player.getAudioManager().send(2734); + player.getAudioManager().send(Sounds.TREE_FALLING_2734); return true; } }