Skip to content

Update upstream #30

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

Merged
mercurialmusic merged 2 commits into from
Feb 16, 2026
Merged

Update upstream #30

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
4a1ed55
changes
JasperTheMinecraftDev Feb 6, 2026
3ae1f24
fix: forced parameter of /tt start not being optional.
JasperTheMinecraftDev Feb 7, 2026
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
2 changes: 1 addition & 1 deletion src/main/java/nl/juriantech/tnttag/managers/ArenaManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void loadArenasFromFile() {
List<String> potionEffects = arenasFile.getStringList(route + ".potionEffects");

if (getArena(route) == null) {
Arena arena = new Arena(plugin, route, startLoc, lobbyLoc, minPlayers, maxPlayers, (ArrayList<String>) potionEffects, roundDuration, countdown);
Arena arena = new Arena(plugin, route, startLoc, lobbyLoc, maxPlayers, minPlayers, (ArrayList<String>) potionEffects, roundDuration, countdown);
Bukkit.getLogger().info("Loaded arena " + arena.getName());
arenaObjects.add(arena);
}
Expand Down
1 change: 0 additions & 1 deletion src/main/java/nl/juriantech/tnttag/managers/PlayerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ private void internalAddPlayer(Player player, int minPlayers) {
}
}


public synchronized void removePlayer(Player player, boolean message) {
if (!players.containsKey(player)) return;
PlayerLeaveArenaEvent event = new PlayerLeaveArenaEvent(player, gameManager.arena.getName());
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/nl/juriantech/tnttag/objects/Round.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,14 @@ public void run() {
gameManager.setGameState(GameState.ENDING, false);
} else {
//Start a new round
gameManager.playerManager.broadcast(ChatUtils.getRaw("arena.new-round-starting").replace("%seconds%", String.valueOf(Tnttag.configfile.getInt("delay.new-round") * 20)));
int delayNewRoundSeconds = Tnttag.configfile.getInt("delay.new-round");
gameManager.playerManager.broadcast(ChatUtils.getRaw("arena.new-round-starting").replace("%seconds%", String.valueOf(delayNewRoundSeconds)));
new BukkitRunnable() {
@Override
public void run() {
gameManager.startRound();
}
}.runTaskLater(plugin, Tnttag.configfile.getInt("delay.new-round") * 20);
}.runTaskLater(plugin, delayNewRoundSeconds * 20);
}
} else if (roundDuration < 0) {
//The game has crashed due to an error
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/nl/juriantech/tnttag/subcommands/StartSubCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import nl.juriantech.tnttag.utils.ChatUtils;
import org.bukkit.entity.Player;
import revxrsal.commands.annotation.Command;
import revxrsal.commands.annotation.Default;
import revxrsal.commands.annotation.Optional;
import revxrsal.commands.annotation.Subcommand;
import revxrsal.commands.bukkit.annotation.CommandPermission;
Expand All @@ -22,7 +23,7 @@ public StartSubCommand(Tnttag plugin) {

@Subcommand("start")
@CommandPermission("tnttag.start")
public void onStart(Player player, String arenaName, @Optional boolean forced) {
public void onStart(Player player, String arenaName, @Optional @Default("false") boolean forced) {
Arena arena = arenaManager.getArena(arenaName);
if (arena == null) {
ChatUtils.sendMessage(player, "commands.invalid-arena");
Expand Down
Loading