SacredRealms/SR-Game
1
0
Fork 0
Code Issues 19 Pull requests Projects 1 Releases Activity Actions

code refactoring

Browse source
This commit is contained in:
unurled 2024-03-18 22:01:16 +01:00
parent 456df87c33
commit 9105d31a02
Signed by: unurled
GPG key ID: FDBC9CBE1F82423F
9 changed files with 652 additions and 542 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/main/java/me/unurled/sacredrealms/sr/commands/player/ResetAdventureCommand.java
View file

@ -9,6 +9,7 @@ import java.util.Objects;
import me.unurled.sacredrealms.sr.SR;
import me.unurled.sacredrealms.sr.components.player.PlayerManager;
import me.unurled.sacredrealms.sr.data.DataManager;
import me.unurled.sacredrealms.sr.managers.Manager;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command;
@ -42,29 +43,7 @@ public class ResetAdventureCommand implements TabExecutor {
@NotNull String label,
@NotNull String[] args) {
if (sender.hasPermission("sr.resetadventure")) {
if (args.length > 2) {
sender.sendMessage(comp("<red>Usage: /resetadventure <player>"));
return true;
}
if (sender instanceof Player p) {
if (args.length == 0) {
boolean status = resetAdventure(p);
if (status) {
p.sendMessage(comp("<green>Your adventure has been reset."));
} else {
p.sendMessage(comp("<red>Failed to reset your adventure."));
}
return true;
}
}
OfflinePlayer player = SR.getInstance().getServer().getOfflinePlayer(args[0]);
boolean status = resetAdventure(player);
if (status) {
sender.sendMessage(comp("<green>Successfully reset " + player.getName() + "'s adventure."));
} else {
sender.sendMessage(comp("<red>Failed to reset " + player.getName() + "'s adventure."));
}
reset(sender, args);
return true;
}
if (args.length > 0) {
@ -76,7 +55,7 @@ public class ResetAdventureCommand implements TabExecutor {
long lastUsed = cooldowns.get(player);
long secondsLeft = ((lastUsed / 1000) + COOLDOWN) - (System.currentTimeMillis() / 1000);
if (secondsLeft > 0) {
player.sendMessage(
sender.sendMessage(
comp(
"<red>You must wait "
+ secondsLeft
@ -86,17 +65,41 @@ public class ResetAdventureCommand implements TabExecutor {
}
boolean status = resetAdventure(player);
if (status) {
player.sendMessage(comp("<green>Your adventure has been reset."));
sender.sendMessage(comp("<green>Your adventure has been reset."));
} else {
player.sendMessage(comp("<red>Failed to reset your adventure."));
sender.sendMessage(comp("<red>Failed to reset your adventure."));
}
cooldowns.put(player, System.currentTimeMillis());
}
return true;
}
private void reset(@NotNull CommandSender sender, @NotNull String[] args) {
if (args.length > 2) {
sender.sendMessage(comp("<red>Usage: /resetadventure <player>"));
return;
}
if (sender instanceof Player p && (args.length == 0)) {
boolean status = resetAdventure(p);
if (status) {
sender.sendMessage(comp("<green>Your adventure has been reset."));
} else {
sender.sendMessage(comp("<red>Failed to reset your adventure."));
}
return;
}
OfflinePlayer player = SR.getInstance().getServer().getOfflinePlayer(args[0]);
boolean status = resetAdventure(player);
if (status) {
sender.sendMessage(comp("<green>Successfully reset " + player.getName() + "'s adventure."));
} else {
sender.sendMessage(comp("<red>Failed to reset " + player.getName() + "'s adventure."));
}
}
private boolean resetAdventure(OfflinePlayer player) {
DataManager dataManager = DataManager.getInstance(DataManager.class);
DataManager dataManager = Manager.getInstance(DataManager.class);
if (dataManager != null) {
if (dataManager.getDataHandler().exists(PlayerManager.PLAYER_KEY + player.getUniqueId())) {
dataManager.getDataHandler().remove(PlayerManager.PLAYER_KEY + player.getUniqueId());