mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-22 15:29:54 +00:00
Fix Bard music restarting/duplicating when opening dialogs
Two issues were causing the bug: 1. GuiDialogInteract.close() called stopAllSounds() unconditionally, which stopped Bard music even when the dialog had no sound or when a different Bard was playing nearby. 2. MusicController.stopMusic() didn't set playDelay, allowing Bards to immediately restart their music after dialog close. Changes: - MusicController.stopMusic() now sets playDelay=20 and clears entity reference to prevent immediate music restart - Added MusicController.stopSound(key) to stop specific sounds - Dialog GUIs now track their dialog sound and only stop that on close, preserving Bard music and other sounds
This commit is contained in:
3 files changed
+56
-1
No files matched your search
@@ -75,6 +75,12 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose {
|
||||
*/
|
||||
private boolean sentClosePacket = false;
|
||||
|
||||
/**
|
||||
* Tracks the dialog sound that was played, so we can stop only this sound
|
||||
* on close without affecting Bard music or other sounds.
|
||||
*/
|
||||
private String dialogSound = null;
|
||||
|
||||
public GuiDialogInteract(EntityNPCInterface npc, Dialog dialog) {
|
||||
super(npc);
|
||||
this.dialog = dialog;
|
||||
@@ -671,8 +677,13 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose {
|
||||
this.options = new ArrayList<Integer>();
|
||||
|
||||
if (dialog.sound != null && !dialog.sound.isEmpty()) {
|
||||
// Stop any previous dialog sound before playing new one
|
||||
if (this.dialogSound != null) {
|
||||
MusicController.Instance.stopSound(this.dialogSound);
|
||||
}
|
||||
MusicController.Instance.stopMusic();
|
||||
MusicController.Instance.playSound(dialog.sound, (float) npc.posX, (float) npc.posY, (float) npc.posZ);
|
||||
this.dialogSound = dialog.sound;
|
||||
}
|
||||
|
||||
if (!dialog.showPreviousBlocks) {
|
||||
@@ -707,7 +718,11 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose {
|
||||
super.close();
|
||||
if (parent != null)
|
||||
NoppesUtil.openGUI(player, parent);
|
||||
MusicController.Instance.stopAllSounds();
|
||||
// Only stop the dialog sound, not Bard music or other sounds
|
||||
if (this.dialogSound != null) {
|
||||
MusicController.Instance.stopSound(this.dialogSound);
|
||||
this.dialogSound = null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -63,6 +63,12 @@ public class GuiModernDialogInteract extends GuiNPCInterface implements IGuiClos
|
||||
*/
|
||||
private boolean sentClosePacket = false;
|
||||
|
||||
/**
|
||||
* Tracks the dialog sound that was played, so we can stop only this sound
|
||||
* on close without affecting Bard music or other sounds.
|
||||
*/
|
||||
private String dialogSound = null;
|
||||
|
||||
public GuiModernDialogInteract(EntityNPCInterface npc, Dialog dialog) {
|
||||
super(npc);
|
||||
this.dialog = dialog;
|
||||
@@ -380,8 +386,13 @@ public class GuiModernDialogInteract extends GuiNPCInterface implements IGuiClos
|
||||
this.options = new ArrayList<Integer>();
|
||||
|
||||
if (dialog.sound != null && !dialog.sound.isEmpty()) {
|
||||
// Stop any previous dialog sound before playing new one
|
||||
if (this.dialogSound != null) {
|
||||
MusicController.Instance.stopSound(this.dialogSound);
|
||||
}
|
||||
MusicController.Instance.stopMusic();
|
||||
MusicController.Instance.playSound(dialog.sound, (float) npc.posX, (float) npc.posY, (float) npc.posZ);
|
||||
this.dialogSound = dialog.sound;
|
||||
}
|
||||
|
||||
if (!dialog.showPreviousBlocks) {
|
||||
@@ -440,6 +451,11 @@ public class GuiModernDialogInteract extends GuiNPCInterface implements IGuiClos
|
||||
}
|
||||
closed();
|
||||
}
|
||||
// Only stop the dialog sound, not Bard music or other sounds
|
||||
if (this.dialogSound != null) {
|
||||
MusicController.Instance.stopSound(this.dialogSound);
|
||||
this.dialogSound = null;
|
||||
}
|
||||
super.onGuiClosed();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user