Skip to content

The beginning of a new era #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabrielvicenteYT wants to merge 2 commits into
base: main
Choose a base branch
from
Open

The beginning of a new era #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4d8ea8
The beginning of a new era
gabrielvicenteYT Jun 7, 2023
4971014
Actually making changes
gabrielvicenteYT Jun 7, 2023
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: 3 additions & 6 deletions src/main/java/rip/crystal/practice/game/ffa/command/FFACommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
package rip.crystal.practice.game.ffa.command;
/*
Made by cpractice Development Team
Created on 27.11.2021
*/

import org.bukkit.entity.Player;
import rip.crystal.practice.Locale;
import rip.crystal.practice.api.command.BaseCommand;
import rip.crystal.practice.api.command.Command;
import rip.crystal.practice.api.command.CommandArgs;
import rip.crystal.practice.game.ffa.command.subcommands.FFAJoinCommand;
import rip.crystal.practice.game.ffa.command.subcommands.FFALeaveCommand;
import rip.crystal.practice.utilities.MessageFormat;
import rip.crystal.practice.utilities.chat.CC;

public class FFACommand extends BaseCommand {
Expand All @@ -25,8 +23,7 @@ public void onCommand(CommandArgs commandArgs) {
Player player = commandArgs.getPlayer();
String[] args = commandArgs.getArgs();
if (args.length == 0) {
player.sendMessage(CC.translate(("&9/ffa leave &7- &fLeave FFA")));
player.sendMessage(CC.translate(("&9/ffa join &7- &fJoin FFA")));
new MessageFormat(Locale.FFA_COMMAND_ARGS.format(profile.getLocale()));
}
}
}
8 changes: 0 additions & 8 deletions src/main/java/rip/crystal/practice/player/queue/Queue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,12 @@ public void addPlayer(Player player, int elo) {
Hotbar.giveHotbarItems(player);

if (ranked) {
//player.sendMessage(Locale.QUEUE_JOIN_RANKED.format(kit.getName(), elo));
new MessageFormat(Locale.QUEUE_JOIN_RANKED.format(profile.getLocale()))
.add("<kit_name>", kit.getName())
.add("<elo>", String.valueOf(elo))
.send(player);
} else {
//player.sendMessage(Locale.QUEUE_JOIN_UNRANKED.format(kit.getName()));

//for (String message : cPractice.get().getLang().getStringList("QUEUE.JOIN_UNRANKED")) {
new MessageFormat(Locale.QUEUE_JOIN_UNRANKED.format(profile.getLocale())).add("<kit_name>", kit.getName()).add("<pingrange>", "" + (profile.getPingRange() == -1 ? "Unrestricted" : Integer.valueOf(profile.getPingRange()))).send(player);
//}
//new MessageFormat(Locale.QUEUE_JOIN_UNRANKED.format(profile.getLocale())).add("<kit_name>", kit.getName()).send(player);
}
}

Expand All @@ -84,12 +78,10 @@ public void removePlayer(QueueProfile queueProfile) {
Hotbar.giveHotbarItems(player);

if (ranked) {
//player.sendMessage(Locale.QUEUE_LEAVE_RANKED.format(kit.getName()));
new MessageFormat(Locale.QUEUE_LEAVE_RANKED.format(profile.getLocale()))
.add("<kit_name>", kit.getName())
.send(player);
} else {
//player.sendMessage(Locale.QUEUE_LEAVE_UNRANKED.format(kit.getName()));
new MessageFormat(Locale.QUEUE_LEAVE_UNRANKED.format(profile.getLocale()))
.add("<kit_name>", kit.getName())
.send(player);
Expand Down