2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-15 11:00:17 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fixed the duplicated sound effects when cutting trees

Browse source
This commit is contained in:
vddcore 2022-07-08 10:31:55 +00:00 • committed by Ryan
parent e837904351
commit 670d59cce3
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java
View file

@ -21,6 +21,7 @@ import core.game.world.map.Location;
import core.game.world.map.RegionManager; import core.game.world.map.RegionManager;
import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Animation;
import core.tools.RandomFunction; import core.tools.RandomFunction;
import org.rs09.consts.Sounds;
import rs09.game.node.entity.skill.farming.FarmingPatch; import rs09.game.node.entity.skill.farming.FarmingPatch;
import rs09.game.node.entity.skill.farming.Patch; import rs09.game.node.entity.skill.farming.Patch;
import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks; 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 * @author ceik
*/ */
public class WoodcuttingSkillPulse extends Pulse { 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 WoodcuttingNode resource;
private int ticks; private int ticks;
@ -109,7 +116,11 @@ public class WoodcuttingSkillPulse extends Pulse {
if(!player.getAnimator().isAnimating()) { if(!player.getAnimator().isAnimating()) {
player.animate(SkillingTool.getHatchet(player).getAnimation()); player.animate(SkillingTool.getHatchet(player).getAnimation());
List<Player> playersAroundMe = RegionManager.getSurroundingPlayers(player); List<Player> playersAroundMe = RegionManager.getLocalPlayers(player, 2)
.stream()
.filter(p -> !p.getUsername().equals(player.getUsername()))
.collect(Collectors.toList());
int soundIndex = RandomFunction.random(0, woodcuttingSounds.length); int soundIndex = RandomFunction.random(0, woodcuttingSounds.length);
player.getAudioManager().send( player.getAudioManager().send(
@ -207,8 +218,7 @@ public class WoodcuttingSkillPulse extends Pulse {
} }
node.setActive(false); node.setActive(false);
// TODO: Extract this someplace appropriate. player.getAudioManager().send(Sounds.TREE_FALLING_2734);
player.getAudioManager().send(2734);
return true; return true;
} }
} }