[Fix]: Fixes a bug where stopping a jukebox after pressing the play b…

…utton twice was not possible
Salandora · Jan 1, 2025 · d5c7f4f · d5c7f4f
1 parent c5f721f
commit d5c7f4f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedcore/upgrades/jukebox/JukeboxUpgradeContainer.java b/src/main/java/net/p3pp3rf1y/sophisticatedcore/upgrades/jukebox/JukeboxUpgradeContainer.java
@@ -19,7 +19,7 @@ public JukeboxUpgradeContainer(Player player, int upgradeContainerId, JukeboxUpg
 			public void setChanged() {
 				super.setChanged();
 				if (upgradeWrapper.isPlaying()) {
-					upgradeWrapper.stop(player);
+					stop();
 				}
 			}
 		});

diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedcore/upgrades/jukebox/JukeboxUpgradeItem.java b/src/main/java/net/p3pp3rf1y/sophisticatedcore/upgrades/jukebox/JukeboxUpgradeItem.java
@@ -108,11 +108,11 @@ private void removeRenderData() {
 		}
 
 		public void stop(LivingEntity entity) {
-			if (!(entity.level() instanceof ServerLevel)) {
+			if (!(entity.level() instanceof ServerLevel serverLevel)) {
 				return;
 			}
 			storageWrapper.getContentsUuid().ifPresent(storageUuid ->
-					ServerStorageSoundHandler.stopPlayingDisc((ServerLevel) entity.level(), entity.position(), storageUuid)
+					ServerStorageSoundHandler.stopPlayingDisc(serverLevel, entity.position(), storageUuid)
 			);
 			setIsPlaying(false);
 		}

diff --git a/...main/java/net/p3pp3rf1y/sophisticatedcore/upgrades/jukebox/ServerStorageSoundHandler.java b/...main/java/net/p3pp3rf1y/sophisticatedcore/upgrades/jukebox/ServerStorageSoundHandler.java
@@ -159,6 +159,7 @@ public static void stopPlayingDisc(ServerLevel serverWorld, Vec3 position, UUID
 			worldStorageSoundKeepAlive.get(dim).get(storageUuid).getSoundHandler().stop(serverWorld, position, storageUuid);
 		}
 		removeKeepAliveInfo(serverWorld, storageUuid);
+		sendStopMessage(serverWorld, position, storageUuid);
 	}
 
 	private static void removeKeepAliveInfo(ServerLevel serverWorld, UUID storageUuid) {