From 3bab11c263151333eb7999e55b6ac1fdc02b7730 Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+ChomeNS@users.noreply.github.com>
Date: Sun, 15 Oct 2023 15:21:14 +0700
Subject: [PATCH] FIX PITCH - MAKE IT NOT SOUND OUT OF TUNE
---
.../chomens_bot/plugins/MusicPlayerPlugin.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java
index 10f6b8be6..9e7afa92c 100644
--- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java
+++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/MusicPlayerPlugin.java
@@ -394,18 +394,16 @@ public class MusicPlayerPlugin extends Bot.Listener {
final boolean shouldCustomPitch = currentSong.nbs ?
isMoreOrLessOctave :
note.pitch != note.shiftedPitch ||
- note.shiftedInstrument != note.instrument;
+ note.shiftedInstrument != note.instrument;E
- final boolean isBass = note.instrument == Instrument.BASS;
-
- final double volume = (isBass ? note.volume * 1.2 : note.volume);
+ final double volume = (note.instrument == Instrument.BASS ? note.volume * 1.5 : note.volume);
if (shouldCustomPitch) {
bot.core.run(
"minecraft:execute as " +
CUSTOM_PITCH_SELECTOR +
" at @s run playsound " +
- (!instrument.equals("off") ? instrument : note.instrument.sound) + ".pitch." + (isBass ? notShiftedFloatingPitch - 1.5 : notShiftedFloatingPitch) +
+ (!instrument.equals("off") ? instrument : note.instrument.sound) + ".pitch." + notShiftedFloatingPitch +
" record @s ^" + blockPosition.getX() + " ^" + blockPosition.getY() + " ^" + blockPosition.getZ() + " " +
volume +
" " +
@@ -431,7 +429,7 @@ public class MusicPlayerPlugin extends Bot.Listener {
" record @s ^" + blockPosition.getX() + " ^" + blockPosition.getY() + " ^" + blockPosition.getZ() + " " +
volume +
" " +
- MathUtilities.clamp((isBass ? floatingPitch - 0.5 : floatingPitch), 0, 2)
+ MathUtilities.clamp(floatingPitch, 0, 2)
);
}