algumas coisas
This commit is contained in:
parent
6ffba0ef6f
commit
51dd89d4aa
|
@ -369,12 +369,12 @@ public class MatchListener implements Listener {
|
||||||
|
|
||||||
final int[] rankings = EloCalculator.getNewRankings(winnerElo, loserElo, true);
|
final int[] rankings = EloCalculator.getNewRankings(winnerElo, loserElo, true);
|
||||||
|
|
||||||
|
match.broadcast(CC.GRAY + " ");
|
||||||
|
|
||||||
eloMessage = String.join("\n",
|
eloMessage = String.join("\n",
|
||||||
CC.YELLOW + "ELO Changes:",
|
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.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) {
|
if (match.getType() == QueueType.RANKED) {
|
||||||
|
@ -387,6 +387,7 @@ public class MatchListener implements Listener {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (eloMessage != null) {
|
if (eloMessage != null) {
|
||||||
match.broadcast(eloMessage);
|
match.broadcast(eloMessage);
|
||||||
}
|
}
|
||||||
|
@ -463,7 +464,6 @@ public class MatchListener implements Listener {
|
||||||
|
|
||||||
EXPUtil.addExperienceToPlayer(player, 10, "Participating in unranked");
|
EXPUtil.addExperienceToPlayer(player, 10, "Participating in unranked");
|
||||||
}
|
}
|
||||||
match.broadcast("");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
TaskUtil.runAsync(() -> this.plugin.getVoteManager().sendVoteMessage(player, match.getArena()));
|
TaskUtil.runAsync(() -> this.plugin.getVoteManager().sendVoteMessage(player, match.getArena()));
|
||||||
|
|
|
@ -812,14 +812,17 @@ public class PlayerListener implements Listener {
|
||||||
switch (playerData.getPlayerState()) {
|
switch (playerData.getPlayerState()) {
|
||||||
case FIGHTING:
|
case FIGHTING:
|
||||||
if (plugin.getMatchManager().getMatch(playerData) != null) {
|
if (plugin.getMatchManager().getMatch(playerData) != null) {
|
||||||
switch (playerData.getOptions().getBodyAnimated()) {
|
PlayerUtil.animateDeath(player, !plugin.getMatchManager().getMatch(playerData).isPartyMatch());
|
||||||
|
// switch (playerData.getOptions().getBodyAnimated()) {
|
||||||
|
/*
|
||||||
case ANIMATED:
|
case ANIMATED:
|
||||||
PlayerUtil.animateDeath(player, !plugin.getMatchManager().getMatch(playerData).isPartyMatch());
|
PlayerUtil.animateDeath(player, !plugin.getMatchManager().getMatch(playerData).isPartyMatch());
|
||||||
break;
|
break;
|
||||||
case STATIC:
|
case STATIC:
|
||||||
PlayerUtil.staticDeath(player, !plugin.getMatchManager().getMatch(playerData).isPartyMatch());
|
PlayerUtil.staticDeath(player, !plugin.getMatchManager().getMatch(playerData).isPartyMatch());
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
this.plugin.getMatchManager().removeFighter(player, playerData, true);
|
this.plugin.getMatchManager().removeFighter(player, playerData, true);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -40,7 +40,7 @@ public class PracticeSettingsImpl implements ISettings {
|
||||||
"",
|
"",
|
||||||
CC.GRAY + "você gostaria de deixar",
|
CC.GRAY + "você gostaria de deixar",
|
||||||
CC.GRAY + "score ativa ou desativada no spawn",
|
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 + "■ ") + "&fEnabled",
|
||||||
(!data.getOptions().isScoreboardEnabled() ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fDisabled"
|
(!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)
|
buttonList.add(new ItemBuilder(Material.SKULL_ITEM)
|
||||||
.setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Animações de corpo")
|
.setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Animações de corpo")
|
||||||
.addLore(
|
.addLore(
|
||||||
|
@ -182,6 +183,8 @@ public class PracticeSettingsImpl implements ISettings {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
|
*/
|
||||||
} else {
|
} else {
|
||||||
buttonList.add(new ItemBuilder(Material.SIGN)
|
buttonList.add(new ItemBuilder(Material.SIGN)
|
||||||
.setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Sidebar Mode")
|
.setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Sidebar Mode")
|
||||||
|
|
|
@ -233,17 +233,21 @@ public final class PlayerUtil {
|
||||||
}
|
}
|
||||||
}, 1L, 1L);
|
}, 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(), () -> {
|
Bukkit.getScheduler().runTaskLater(Practice.getInstance(), () -> {
|
||||||
for (Player watcher : sentTo) {
|
for (Player watcher : sentTo) {
|
||||||
((CraftPlayer) watcher).getHandle().playerConnection.sendPacket(new PacketPlayOutEntityDestroy(entityId));
|
((CraftPlayer) watcher).getHandle().playerConnection.sendPacket(new PacketPlayOutEntityDestroy(entityId));
|
||||||
}
|
}
|
||||||
}, 40L);
|
}, 100L); // Change from 40L to 100L for approximately 5 seconds (100 ticks)
|
||||||
if (showPlayer) Bukkit.getScheduler().runTaskLater(Practice.getInstance(), () -> {
|
|
||||||
|
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()) {
|
for (Player player1 : Bukkit.getOnlinePlayers()) {
|
||||||
player1.showPlayer(player);
|
player1.showPlayer(player);
|
||||||
}
|
}
|
||||||
}, 60L);
|
}, 100L);
|
||||||
|
}
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
ex.printStackTrace();
|
ex.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,9 +31,8 @@ public class VoteManager {
|
||||||
public void sendVoteMessage(Player player, Arena arena) {
|
public void sendVoteMessage(Player player, Arena arena) {
|
||||||
|
|
||||||
ChatComponentBuilder builder = new ChatComponentBuilder("");
|
ChatComponentBuilder builder = new ChatComponentBuilder("");
|
||||||
builder.append(CC.WHITE + "Give us some feedback about ");
|
builder.append(CC.AQUA + "Give us some feedback on " + CC.YELLOW + arena.getName() + "by clicking" );
|
||||||
builder.append(CC.GOLD + arena.getName());
|
builder.append(CC.AQUA + "one of the stars: ");
|
||||||
builder.append(CC.WHITE + " by clicking one of the stars: ");
|
|
||||||
|
|
||||||
Arrays.stream(Vote.values()).forEach(rating -> builder.append(rating.getDisplayName() + " ")
|
Arrays.stream(Vote.values()).forEach(rating -> builder.append(rating.getDisplayName() + " ")
|
||||||
.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/rate " + rating.name()))
|
.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/rate " + rating.name()))
|
||||||
|
|
Loading…
Reference in New Issue