m724/porject91
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix binding speaker and other errors

Browse source
This commit is contained in:
Minecon724 2024-12-20 11:30:19 +01:00
commit 26963e32ca
No known key found for this signature in database
GPG key ID: 3CCC4D267742C8E8
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/eu/m724/musicPlugin/item/ItemEvents.java
View file

@ -52,14 +52,20 @@ public class ItemEvents implements Listener {
var block = event.getClickedBlock(); var block = event.getClickedBlock();
if (block != null) { if (block != null) {
if (block.getType() == Material.NOTE_BLOCK) { if (block.getType() == Material.NOTE_BLOCK) {
if (event.getPlayer().getGameMode() == GameMode.CREATIVE)
event.setCancelled(true); // prevent accidental break
var location = block.getLocation().add(0.5, 0.5, 0.5); var location = block.getLocation().add(0.5, 0.5, 0.5);
var speaker = BlockSpeaker.create(location); var speaker = BlockSpeaker.create(location);
if (speaker == null) {
event.getPlayer().sendMessage("This speaker is occupied");
return;
}
player.setSpeaker(speaker); player.setSpeaker(speaker);
block.getWorld().spawnParticle(Particle.HAPPY_VILLAGER, block.getLocation(), 10); block.getWorld().spawnParticle(Particle.HAPPY_VILLAGER, block.getLocation(), 10);
if (event.getPlayer().getGameMode() == GameMode.CREATIVE)
event.setCancelled(true); // prevent accidental break
} }
} }
} }

3
src/main/java/eu/m724/musicPlugin/item/PortableMediaPlayer.java
View file

@ -56,7 +56,8 @@ public class PortableMediaPlayer {
speaker.setDestroyCallback(c -> { speaker.setDestroyCallback(c -> {
System.out.println("spekar rip"); System.out.println("spekar rip");
played.pause(); // this one stops the tracker not playback, which is stopped in Speaker if (played != null)
played.pause(); // this one stops the tracker not playback, which is stopped in Speaker
this.speaker = null; this.speaker = null;
}); });

9
src/main/java/eu/m724/musicPlugin/item/speaker/BlockSpeaker.java
View file

@ -19,9 +19,14 @@ public class BlockSpeaker extends Speaker {
} }
public static BlockSpeaker create(Location location) { public static BlockSpeaker create(Location location) {
if (speakers.containsKey(location)) var below = location.clone().subtract(0, 1, 0);
if (speakers.containsKey(location) || speakers.containsKey(below))
return null; return null;
return speakers.compute(location, (k, v) -> new BlockSpeaker(location));
var isTopSpeaker = below.getBlock().getType() == Material.NOTE_BLOCK;
System.out.println("SPekaer is top: " + isTopSpeaker);
return speakers.compute(isTopSpeaker ? below : location, (k, v) -> new BlockSpeaker(k));
} }
/* */ /* */