Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/main/java/dev/noah/perplayerkit/KitManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ private boolean loadKitInternal(Player player, String kitId, String notFoundMess

public boolean loadKit(Player player, int slot) {
return loadKitInternal(player, IDUtil.getPlayerKitId(player.getUniqueId(), slot), "Kit " + slot + " does not exist!", false, () -> {
BroadcastManager.get().broadcastPlayerLoadedPrivateKit(player);
BroadcastManager.get().broadcastPlayerLoadedPrivateKit(player, "Kit " + slot);
player.sendMessage(ChatColor.GREEN + "Kit " + slot + " loaded!");
lastKitUsedByPlayer.put(player.getUniqueId(), slot);
});
Expand All @@ -347,8 +347,13 @@ public boolean loadKitSilent(Player player, int slot) {
}

public boolean loadPublicKit(Player player, String id) {
String kitDisplayName = publicKitList.stream()
.filter(k -> k.id.equals(id))
.map(k -> k.name)
.findFirst()
.orElse(id);
return loadKitInternal(player, IDUtil.getPublicKitId(id), "Kit does not exist!", false, () -> {
BroadcastManager.get().broadcastPlayerLoadedPublicKit(player);
BroadcastManager.get().broadcastPlayerLoadedPublicKit(player, kitDisplayName);
player.sendMessage(ChatColor.GREEN + "Public Kit loaded!");
player.sendMessage(ChatColor.GRAY + "You can save a custom version this kit by importing into the kit editor");
});
Expand Down
16 changes: 12 additions & 4 deletions src/main/java/dev/noah/perplayerkit/util/BroadcastManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ private void broadcastMessage(Player player, String message, String permission)
}

private void broadcastMessage(Player player, BroadcastManager.MessageKey key, CooldownManager cooldownManager) {
broadcastMessage(player, key, cooldownManager, null);
}

private void broadcastMessage(Player player, BroadcastManager.MessageKey key, CooldownManager cooldownManager, String kitName) {

if(!plugin.getConfig().getBoolean("feature.broadcast-on-player-action",true)){
return;
Expand Down Expand Up @@ -133,6 +137,10 @@ private void broadcastMessage(Player player, BroadcastManager.MessageKey key, Co

message = message.replace("%player%", playerName);

if (kitName != null) {
message = message.replace("%kitname%", kitName);
}

broadcastMessage(player, message, permission);

if (cooldownManager != null) {
Expand All @@ -152,12 +160,12 @@ public void broadcastPlayerOpenedKitRoom(Player player) {
broadcastMessage(player, MessageKey.PLAYER_OPENED_KIT_ROOM, kitroomBroadcastCooldown);
}

public void broadcastPlayerLoadedPrivateKit(Player player) {
broadcastMessage(player, MessageKey.PLAYER_LOADED_PRIVATE_KIT, null);
public void broadcastPlayerLoadedPrivateKit(Player player, String kitName) {
broadcastMessage(player, MessageKey.PLAYER_LOADED_PRIVATE_KIT, null, kitName);
}

public void broadcastPlayerLoadedPublicKit(Player player) {
broadcastMessage(player, MessageKey.PLAYER_LOADED_PUBLIC_KIT, null);
public void broadcastPlayerLoadedPublicKit(Player player, String kitName) {
broadcastMessage(player, MessageKey.PLAYER_LOADED_PUBLIC_KIT, null, kitName);
}

public void broadcastPlayerLoadedEnderChest(Player player) {
Expand Down