This commit is contained in:
parent
4b28838194
commit
dda73e3ccc
2 changed files with 41 additions and 1 deletions
|
@ -195,4 +195,44 @@ public class TPAudioCMD extends BaseCommand {
|
|||
|
||||
sender.sendMessage(ChatColor.GRAY + "Playback stopped!");
|
||||
}
|
||||
|
||||
@Subcommand("stopchannel")
|
||||
@Description("")
|
||||
public void onStopChannel(CommandSender sender, String selector, AudioType type) {
|
||||
List<Player> players = new ArrayList<>();
|
||||
Player target = Bukkit.getPlayer(selector);
|
||||
if (target != null) {
|
||||
if (!PinManager.hasPin(target.getUniqueId())) {
|
||||
sender.sendMessage(ChatColor.GRAY + "The player is not connected to the client.");
|
||||
return;
|
||||
}
|
||||
|
||||
players.add(target);
|
||||
} else {
|
||||
SpigotPlayerSelector sel = new SpigotPlayerSelector(selector);
|
||||
|
||||
if (sel.getArgument("region").length() != 0) {
|
||||
if (!ThemeParkAudio.isRegionSupport()) {
|
||||
sender.sendMessage(ChatColor.GRAY + "Region support is not available.");
|
||||
return;
|
||||
}
|
||||
String regionID = sel.getArgument("region");
|
||||
new PlayInRegionHandler(regionID, "", sel.getPlayers(sender).stream().map(Entity::getUniqueId).collect(Collectors.toList()));
|
||||
|
||||
sender.sendMessage(ChatColor.GRAY + "Playback stopped in region " + regionID + "!");
|
||||
return;
|
||||
} else {
|
||||
players.addAll(sel.getPlayers(sender));
|
||||
}
|
||||
}
|
||||
|
||||
if (type == AudioType.RADIO && !ThemeParkAudio.getInstance().getConfig().getBoolean("radio")) {
|
||||
sender.sendMessage(ChatColor.GRAY + "The radio is disabled, so it can't be played on.");
|
||||
return;
|
||||
}
|
||||
|
||||
AudioMessage.of(type, "").broadcastSelection(players, PinManager::hasPin);
|
||||
|
||||
sender.sendMessage(ChatColor.GRAY + "Playback stopped!");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@ public class ActionFotoMessage extends AbstractMessage {
|
|||
JSONObject data = new JSONObject();
|
||||
data.put("attractionId", attractionId);
|
||||
data.put("image", image);
|
||||
data.put("timestamp", timestamp.toString());
|
||||
data.put("timestamp", timestamp.toInstant().toString());
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue