From 51dd89d4aa698c6b54304950ea0bd43088d0af64 Mon Sep 17 00:00:00 2001 From: nearfe Date: Sun, 16 Jun 2024 01:44:28 -0300 Subject: [PATCH] algumas coisas --- .../practice/listeners/MatchListener.java | 6 +++--- .../practice/listeners/PlayerListener.java | 7 +++++-- .../settings/PracticeSettingsImpl.java | 5 ++++- .../land/battle/practice/util/PlayerUtil.java | 18 +++++++++++------- .../land/battle/practice/vote/VoteManager.java | 5 ++--- 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/main/java/land/battle/practice/listeners/MatchListener.java b/src/main/java/land/battle/practice/listeners/MatchListener.java index 581cbf7..152975d 100644 --- a/src/main/java/land/battle/practice/listeners/MatchListener.java +++ b/src/main/java/land/battle/practice/listeners/MatchListener.java @@ -369,12 +369,12 @@ public class MatchListener implements Listener { final int[] rankings = EloCalculator.getNewRankings(winnerElo, loserElo, true); + match.broadcast(CC.GRAY + " "); eloMessage = String.join("\n", CC.YELLOW + "ELO Changes:", CC.GRAY + Constants.DOT_SYMBOL + " " + CC.GREEN + winnerLeader.getName() + ":" + CC.WHITE + " " + (rankings[0]) + " " + CC.GRAY + "(" + CC.GREEN + "+" + (rankings[0] - winnerElo) + CC.GRAY + ")", - CC.GRAY + Constants.DOT_SYMBOL + " " + CC.RED + loserLeader.getName() + ":" + CC.WHITE + " " + (rankings[1]) + " " + CC.GRAY + "(" + CC.RED + (rankings[1] - loserElo) + CC.GRAY + ")", - ("") + CC.GRAY + Constants.DOT_SYMBOL + " " + CC.RED + loserLeader.getName() + ":" + CC.WHITE + " " + (rankings[1]) + " " + CC.GRAY + "(" + CC.RED + (rankings[1] - loserElo) + CC.GRAY + ")" ); if (match.getType() == QueueType.RANKED) { @@ -387,6 +387,7 @@ public class MatchListener implements Listener { } + if (eloMessage != null) { match.broadcast(eloMessage); } @@ -463,7 +464,6 @@ public class MatchListener implements Listener { EXPUtil.addExperienceToPlayer(player, 10, "Participating in unranked"); } - match.broadcast(""); } TaskUtil.runAsync(() -> this.plugin.getVoteManager().sendVoteMessage(player, match.getArena())); diff --git a/src/main/java/land/battle/practice/listeners/PlayerListener.java b/src/main/java/land/battle/practice/listeners/PlayerListener.java index 4fadd0d..f0e7314 100644 --- a/src/main/java/land/battle/practice/listeners/PlayerListener.java +++ b/src/main/java/land/battle/practice/listeners/PlayerListener.java @@ -812,14 +812,17 @@ public class PlayerListener implements Listener { switch (playerData.getPlayerState()) { case FIGHTING: if (plugin.getMatchManager().getMatch(playerData) != null) { - switch (playerData.getOptions().getBodyAnimated()) { + PlayerUtil.animateDeath(player, !plugin.getMatchManager().getMatch(playerData).isPartyMatch()); + // switch (playerData.getOptions().getBodyAnimated()) { + /* case ANIMATED: PlayerUtil.animateDeath(player, !plugin.getMatchManager().getMatch(playerData).isPartyMatch()); break; case STATIC: PlayerUtil.staticDeath(player, !plugin.getMatchManager().getMatch(playerData).isPartyMatch()); break; - } + + */ } this.plugin.getMatchManager().removeFighter(player, playerData, true); break; diff --git a/src/main/java/land/battle/practice/settings/PracticeSettingsImpl.java b/src/main/java/land/battle/practice/settings/PracticeSettingsImpl.java index 1fcbf94..d6a3ba4 100644 --- a/src/main/java/land/battle/practice/settings/PracticeSettingsImpl.java +++ b/src/main/java/land/battle/practice/settings/PracticeSettingsImpl.java @@ -40,7 +40,7 @@ public class PracticeSettingsImpl implements ISettings { "", CC.GRAY + "você gostaria de deixar", CC.GRAY + "score ativa ou desativada no spawn", - CC.GRAY + "um em uma partida?", + CC.GRAY + "e em uma partida?", " ", (data.getOptions().isScoreboardEnabled() ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fEnabled", (!data.getOptions().isScoreboardEnabled() ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fDisabled" @@ -164,6 +164,7 @@ public class PracticeSettingsImpl implements ISettings { }) ); + /* buttonList.add(new ItemBuilder(Material.SKULL_ITEM) .setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Animações de corpo") .addLore( @@ -182,6 +183,8 @@ public class PracticeSettingsImpl implements ISettings { } }) ); + + */ } else { buttonList.add(new ItemBuilder(Material.SIGN) .setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Sidebar Mode") diff --git a/src/main/java/land/battle/practice/util/PlayerUtil.java b/src/main/java/land/battle/practice/util/PlayerUtil.java index 170f49b..96fc499 100644 --- a/src/main/java/land/battle/practice/util/PlayerUtil.java +++ b/src/main/java/land/battle/practice/util/PlayerUtil.java @@ -233,17 +233,21 @@ public final class PlayerUtil { } }, 1L, 1L); - // Schedule task to destroy the fake entity after a delay +// Schedule task to destroy the fake entity after a delay (currently 40 ticks) Bukkit.getScheduler().runTaskLater(Practice.getInstance(), () -> { for (Player watcher : sentTo) { ((CraftPlayer) watcher).getHandle().playerConnection.sendPacket(new PacketPlayOutEntityDestroy(entityId)); } - }, 40L); - if (showPlayer) Bukkit.getScheduler().runTaskLater(Practice.getInstance(), () -> { - for (Player player1 : Bukkit.getOnlinePlayers()) { - player1.showPlayer(player); - } - }, 60L); + }, 100L); // Change from 40L to 100L for approximately 5 seconds (100 ticks) + + if (showPlayer) { + // Schedule task to show the real player again after a delay (currently 60 ticks) + Bukkit.getScheduler().runTaskLater(Practice.getInstance(), () -> { + for (Player player1 : Bukkit.getOnlinePlayers()) { + player1.showPlayer(player); + } + }, 100L); + } } catch (Exception ex) { ex.printStackTrace(); } diff --git a/src/main/java/land/battle/practice/vote/VoteManager.java b/src/main/java/land/battle/practice/vote/VoteManager.java index eb24a76..e50c76a 100644 --- a/src/main/java/land/battle/practice/vote/VoteManager.java +++ b/src/main/java/land/battle/practice/vote/VoteManager.java @@ -31,9 +31,8 @@ public class VoteManager { public void sendVoteMessage(Player player, Arena arena) { ChatComponentBuilder builder = new ChatComponentBuilder(""); - builder.append(CC.WHITE + "Give us some feedback about "); - builder.append(CC.GOLD + arena.getName()); - builder.append(CC.WHITE + " by clicking one of the stars: "); + builder.append(CC.AQUA + "Give us some feedback on " + CC.YELLOW + arena.getName() + "by clicking" ); + builder.append(CC.AQUA + "one of the stars: "); Arrays.stream(Vote.values()).forEach(rating -> builder.append(rating.getDisplayName() + " ") .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/rate " + rating.name()))