Merge pull request #467 from Mindgamesnl/feature/train-media-id

assign static train media
Mindgamesnl · Jan 21, 2025 · 6fa2750 · 6fa2750
2 parents ffc6cc6 + 4674b0f
commit 6fa2750
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/...n/src/main/java/com/craftmend/openaudiomc/spigot/modules/traincarts/TrainCartsModule.java b/...n/src/main/java/com/craftmend/openaudiomc/spigot/modules/traincarts/TrainCartsModule.java
@@ -45,7 +45,7 @@ public void stopStrain(String trainName, SignActionEvent event) {
             for (MinecartMember<?> minecartMember : member) {
                 for (Player playerPassenger : minecartMember.getEntity().getPlayerPassengers()) {
                     SpigotConnection spigotConnection = OpenAudioMc.getService(SpigotPlayerService.class).getClient(playerPassenger);
-                    OpenAudioMc.getService(NetworkingService.class).send(spigotConnection.getClientConnection(), new PacketClientDestroyMedia(media.getMediaId().toString()));
+                    OpenAudioMc.getService(NetworkingService.class).send(spigotConnection.getClientConnection(), new PacketClientDestroyMedia(media.getMedia().getMediaId()));
                 }
             }
         }

diff --git a/...ain/java/com/craftmend/openaudiomc/spigot/modules/traincarts/listeners/TrainListener.java b/...ain/java/com/craftmend/openaudiomc/spigot/modules/traincarts/listeners/TrainListener.java
@@ -60,7 +60,7 @@ public void onVehicleExit(VehicleExitEvent event) {
             if (media == null) return;
 
             SpigotConnection spigotConnection = OpenAudioMc.getService(SpigotPlayerService.class).getClient(player);
-            OpenAudioMc.getService(NetworkingService.class).send(spigotConnection.getClientConnection(), new PacketClientDestroyMedia(media.getMediaId().toString()));
+            OpenAudioMc.getService(NetworkingService.class).send(spigotConnection.getClientConnection(), new PacketClientDestroyMedia(media.getMedia().getMediaId().toString()));
         }
     }
 

diff --git a/.../src/main/java/com/craftmend/openaudiomc/spigot/modules/traincarts/models/TrainMedia.java b/.../src/main/java/com/craftmend/openaudiomc/spigot/modules/traincarts/models/TrainMedia.java
@@ -6,12 +6,10 @@
 import lombok.Data;
 
 import java.time.Instant;
-import java.util.UUID;
 
 @Data
-public class    TrainMedia {
+public class TrainMedia {
 
-    private UUID mediaId = UUID.randomUUID();
     private Instant startedAt = OpenAudioMc.getService(TimeService.class).getSyncedInstant();
     private String source;
     private Media media;
@@ -20,7 +18,7 @@ public TrainMedia(String source) {
         this.source = source;
         this.media = new Media(this.source);
         this.media.setDoPickup(true);
-        this.media.setMediaId(this.mediaId.toString());
+        this.media.setMediaId("train_audio");
         this.media.setLoop(false);
     }