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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.retromc</groupId>
<artifactId>arenafighter</artifactId>
<version>1.0.8</version>
<version>1.0.9</version>

<packaging>jar</packaging>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.garsooon.arenafighter.Data.Bet;
import org.garsooon.arenafighter.Data.Challenge;
import org.garsooon.arenafighter.Economy.Method;
import org.garsooon.arenafighter.Economy.Methods;
import org.garsooon.arenafighter.Fight.FightManager;

import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

public class FightCommand implements CommandExecutor {
Expand Down Expand Up @@ -65,6 +67,20 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
}
return handleCancel(player);

case "leaderboard":
if (!player.hasPermission("arenafighter.fight")) {
player.sendMessage(ChatColor.RED + "You do not have permission to see the leaderboard.");
return true;
}
return handleLeaderboard(player);

case "stats":
if (!player.hasPermission("arenafighter.fight")) {
player.sendMessage(ChatColor.RED + "You do not have permission to see stats.");
return true;
}
return handleStats(player, args);

case "help":
default:
sendHelp(player);
Expand Down Expand Up @@ -124,6 +140,7 @@ private boolean handleChallenge(Player challenger, String[] args) {
if (args.length >= 3) {
try {
wagerAmount = Double.parseDouble(args[2]);
wagerAmount = Bet.roundDownTwoDecimals(wagerAmount); // <-- round down here
if (wagerAmount < 0) {
challenger.sendMessage(ChatColor.RED + "Wager amount cannot be negative.");
return true;
Expand Down Expand Up @@ -223,6 +240,7 @@ private boolean handleAccept(Player accepter, String[] args) {
}

double wager = challenge.getWagerAmount();
double truncatedWager = Bet.roundDownTwoDecimals(wager);

// Balance check for wagers
if (wager > 0) {
Expand All @@ -239,7 +257,7 @@ private boolean handleAccept(Player accepter, String[] args) {
// Broadcast fight accept with wager message when there is a wager
String line1 = ChatColor.GOLD + accepter.getName() + ChatColor.YELLOW + " has accepted " +
ChatColor.GOLD + challenger.getName() + ChatColor.YELLOW + "'s duel request";
String line2 = (wager > 0 ? ChatColor.YELLOW + " with a wager of " + ChatColor.GREEN + wager : "") + ChatColor.YELLOW + "!";
String line2 = (truncatedWager > 0 ? ChatColor.YELLOW + " with a wager of " + ChatColor.GREEN + truncatedWager : "") + ChatColor.YELLOW + "!";
String line3 = ChatColor.YELLOW + "The fight will begin in 30 seconds...";

Bukkit.broadcastMessage(line1);
Expand All @@ -264,6 +282,42 @@ private boolean handleAccept(Player accepter, String[] args) {
return true;
}

private boolean handleLeaderboard(Player player) {
Map<String, Integer> topPlayers = fightManager.getTopPlayersByWins();

if (topPlayers.isEmpty()) {
player.sendMessage(ChatColor.RED + "No leaderboard data found.");
return true;
}

player.sendMessage(ChatColor.GOLD + "=== ArenaFighter Leaderboard ===");
int rank = 1;
for (Map.Entry<String, Integer> entry : topPlayers.entrySet()) {
player.sendMessage(ChatColor.YELLOW + "#" + rank + " " + ChatColor.AQUA + entry.getKey()
+ ChatColor.WHITE + " - " + ChatColor.GREEN + entry.getValue() + " wins");
rank++;
}

return true;
}

private boolean handleStats(Player player, String[] args) {
String targetName;

if (args.length == 1) {
// Show own stats
targetName = player.getName();
} else {
targetName = args[1];
}

List<String> statsLines = fightManager.getPlayerStatsByName(targetName);
for (String line : statsLines) {
player.sendMessage(line);
}
return true;
}

private boolean handleCancel(Player player) {
if (!fightManager.isInFight(player)) {
player.sendMessage(ChatColor.RED + "You're not in a fight.");
Expand All @@ -280,6 +334,8 @@ private void sendHelp(Player player) {
player.sendMessage(ChatColor.YELLOW + "/fight challenge <player> <wager>" + ChatColor.WHITE + " - Challenge a player");
player.sendMessage(ChatColor.YELLOW + "/fight accept <player>" + ChatColor.WHITE + " - Accept a challenge");
player.sendMessage(ChatColor.YELLOW + "/fight cancel" + ChatColor.WHITE + " - Cancel current fight");
player.sendMessage(ChatColor.YELLOW + "/fight leaderboard" + ChatColor.WHITE + " - Show top 10 fighters");
player.sendMessage(ChatColor.YELLOW + "/fight stats <player>" + ChatColor.WHITE + " - Show player stats");
player.sendMessage(ChatColor.YELLOW + "/fight help" + ChatColor.WHITE + " - Show help");
player.sendMessage(ChatColor.YELLOW + "/spectate <arena>" + ChatColor.WHITE + " - Start spectating");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.garsooon.arenafighter.Fight.Fight;
import org.garsooon.arenafighter.Economy.Methods;
import org.garsooon.arenafighter.Economy.Method;
import org.garsooon.arenafighter.Data.Bet;

public class SpectateBetCommand implements CommandExecutor {

Expand All @@ -29,7 +30,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
player.sendMessage(ChatColor.RED + "Economy plugin not detected. Betting is disabled.");
return true;
}

if (args.length != 2) {
player.sendMessage(ChatColor.RED + "Usage: /bet <fighter> <amount>");
return true;
Expand All @@ -40,6 +41,11 @@ public boolean onCommand(CommandSender sender, Command command, String label, St

try {
amount = Double.parseDouble(args[1]);
amount = Bet.roundDownTwoDecimals(amount);
if (amount <= 0) {
player.sendMessage(ChatColor.RED + "Bet amount must be greater than 0.");
return true;
}
} catch (NumberFormatException e) {
player.sendMessage(ChatColor.RED + "Invalid amount.");
return true;
Expand All @@ -58,7 +64,6 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
return true;
}

//FUTURE USE
if (fight.hasStarted()) {
player.sendMessage(ChatColor.RED + "You cannot bet, the fight has already started.");
return true;
Expand All @@ -69,22 +74,27 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
return true;
}

if (!fight.placeBet(player.getName(), fighterName, amount)) {
player.sendMessage(ChatColor.RED + "You have already placed a bet.");
if (fight.containsPlayer(player)) {
player.sendMessage(ChatColor.RED + "You cannot bet on a fight you are participating in.");
return true;
}

if (fight.containsPlayer(player)) {
player.sendMessage(ChatColor.RED + "You cannot bet on a fight you are participating in.");
if (!fight.placeBet(player.getName(), fighterName, amount)) {
player.sendMessage(ChatColor.RED + "You have already placed a bet.");
return true;
}

if (!economy.withdrawPlayer(player.getName(), amount, player.getWorld())) {
player.sendMessage(ChatColor.RED + "Failed to withdraw funds.");
return true;
}
String msg = ChatColor.AQUA + player.getName() +
ChatColor.YELLOW + " placed a bet of " +
ChatColor.GOLD + amount +
ChatColor.YELLOW + " on " +
ChatColor.GREEN + fighterName + ChatColor.YELLOW + "!";
player.getServer().broadcastMessage(msg);

player.sendMessage(ChatColor.GREEN + "You placed a bet of " + amount + " on " + fighterName + ".");
return true;
}
}
9 changes: 9 additions & 0 deletions src/main/java/org/garsooon/arenafighter/Data/Bet.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package org.garsooon.arenafighter.Data;

import java.math.BigDecimal;
import java.math.RoundingMode;

public class Bet {
private final String spectator;
private final String fighter;
Expand All @@ -23,4 +26,10 @@ public String getFighter() {
public double getAmount() {
return amount;
}

public static double roundDownTwoDecimals(double value) {
BigDecimal bd = BigDecimal.valueOf(value);
bd = bd.setScale(2, RoundingMode.DOWN); // truncate to 2 decimal places, no rounding up
return bd.doubleValue();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package org.garsooon.arenafighter.Data;

import java.util.HashMap;
import java.util.Map;
import java.util.UUID;

// Utility class to try and stop the feature bloat in FightManager
public class PlayerDataManager {
private static final Map<UUID, String> uuidToUsername = new HashMap<>();
private static final Map<String, UUID> usernameToUUID = new HashMap<>();

public static void setPlayer(UUID uuid, String username) {
if (uuid == null || username == null) return;

uuidToUsername.put(uuid, username);
usernameToUUID.put(username.toLowerCase(), uuid);
}

public static String getUsername(UUID uuid) {
return uuidToUsername.get(uuid);
}

public static UUID getUUID(String username) {
return usernameToUUID.get(username.toLowerCase());
}

public static boolean hasPlayer(UUID uuid) {
return uuidToUsername.containsKey(uuid);
}

public static boolean hasUsername(String name) {
return usernameToUUID.containsKey(name.toLowerCase());
}

public static Map<UUID, String> getAllUUIDToUsername() {
return new HashMap<>(uuidToUsername);
}

public static void clear() {
uuidToUsername.clear();
usernameToUUID.clear();
}
}
Loading