diff --git a/Challenge/pom.xml b/Challenge/pom.xml index 07ab086..c71b82e 100644 --- a/Challenge/pom.xml +++ b/Challenge/pom.xml @@ -30,23 +30,23 @@ 0.0.1-SNAPSHOT provided - - me.Jumper251 - AdvancedReplay - 1.8.7 - provided - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.3.0 - - ${project.artifactId} - - - - + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + ${project.artifactId} + + + + diff --git a/Challenge/src/main/java/de/fanta/challenge/Challenge.java b/Challenge/src/main/java/de/fanta/challenge/Challenge.java index 8d184f2..f8ffe41 100644 --- a/Challenge/src/main/java/de/fanta/challenge/Challenge.java +++ b/Challenge/src/main/java/de/fanta/challenge/Challenge.java @@ -26,8 +26,6 @@ import de.iani.playerUUIDCache.PlayerUUIDCache; import de.speedy64.globalport.GlobalApi; import io.papermc.paper.ban.BanListType; -import me.jumper251.replay.api.ReplayAPI; -import me.jumper251.replay.replaysystem.Replay; import net.kyori.adventure.key.Key; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; @@ -331,13 +329,13 @@ @Override public void onDisable() { - if (plugin.getServer().getPluginManager().isPluginEnabled("AdvancedReplay")) { + /*if (plugin.getServer().getPluginManager().isPluginEnabled("AdvancedReplay")) { ReplayAPI replayAPI = ReplayAPI.getInstance(); Replay replay = DeathrunChallengeEventMonth.currentReplay; if (replay != null) { replayAPI.stopReplay(replay.getId(), true, false, true); } - } + }*/ BanList banList = Bukkit.getBanList(BanListType.PROFILE); banList.getEntries().forEach(banEntry -> banList.pardon((PlayerProfile) banEntry)); diff --git a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/DeathrunChallengeEventMonth.java b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/DeathrunChallengeEventMonth.java index eda37f9..1d61e7a 100644 --- a/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/DeathrunChallengeEventMonth.java +++ b/Challenge/src/main/java/de/fanta/challenge/challenges/ChallengeEvents/DeathrunChallengeEventMonth.java @@ -16,8 +16,6 @@ import de.iani.cubesideutils.FontUtil; import de.iani.cubesideutils.StringUtil; import de.iani.cubesideutils.bukkit.items.ItemGroups; -import me.jumper251.replay.api.ReplayAPI; -import me.jumper251.replay.replaysystem.Replay; import net.kyori.adventure.bossbar.BossBar; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; @@ -116,8 +114,8 @@ private static ChallengeScoreboardTeam challengeScoreboardTeam; private static final HashMap positionColors = new HashMap<>(); - private static ReplayAPI replayAPI; - public static Replay currentReplay; + //private static ReplayAPI replayAPI; + //public static Replay currentReplay; @EventHandler public void onTimerChange(TimerChangedEvent e) { @@ -417,7 +415,7 @@ public static void load(World playerWold) { if (plugin.getServer().getPluginManager().isPluginEnabled("AdvancedReplay")) { - replayAPI = ReplayAPI.getInstance(); + //replayAPI = ReplayAPI.getInstance(); startNewReplay(); startReplayScheduler(); } @@ -501,14 +499,14 @@ } private static void saveAndStartNewReplay() { - if (currentReplay != null) { + /*if (currentReplay != null) { replayAPI.stopReplay(currentReplay.getId(), true, true, true); - } + }*/ startNewReplay(); } private static void startNewReplay() { - currentReplay = replayAPI.recordReplay(StringUtil.formatDate(System.currentTimeMillis()).replace(" ", "-")); + //currentReplay = replayAPI.recordReplay(StringUtil.formatDate(System.currentTimeMillis()).replace(" ", "-")); } private void resetBarrier(Player p, World world, List locations) { diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/ReviveCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/ReviveCommand.java index ccb3a36..a1ac2e9 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/ReviveCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/ReviveCommand.java @@ -34,7 +34,7 @@ if (next.equalsIgnoreCase("all")) { MLGChallenge.setMLGinProgress(false); for (Player p : Bukkit.getOnlinePlayers()) { - p.setHealth(p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()); + p.setHealth(p.getAttribute(Attribute.MAX_HEALTH).getValue()); p.setGameMode(GameMode.SURVIVAL); } plugin.getComponentUtil().sendBrodCastMessage(Component.text("Alle Spieler wurden wiederbelebt! Es kann weiter gehen!", Color.GREEN)); @@ -42,7 +42,7 @@ OfflinePlayer other = (Bukkit.getServer().getOfflinePlayer(next)); if (other.isOnline()) { Player p = (Player) other; - p.setHealth(p.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()); + p.setHealth(p.getAttribute(Attribute.MAX_HEALTH).getValue()); p.setGameMode(GameMode.SURVIVAL); plugin.getComponentUtil().sendBrodCastMessage(p.name().append(Component.text(" wurde von ").append(sender.name()).append(Component.text(" wiederbelebt!"))).color(Color.GREEN)); } else { diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPAddCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPAddCommand.java index 8340e1a..22b1f09 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPAddCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPAddCommand.java @@ -34,7 +34,7 @@ double input = args.getNext(0.0); double finalAddHP = player.getHealth() + input; - if (finalAddHP <= player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() && finalAddHP >= 0) { + if (finalAddHP <= player.getAttribute(Attribute.MAX_HEALTH).getValue() && finalAddHP >= 0) { player.setHealth(finalAddHP); plugin.getComponentUtil().sendNormalMessage(player, "Du wurdest von " + sender.getName() + " um " + input + "HP geheilt!"); plugin.getComponentUtil().sendNormalMessage(sender, "Du hast " + player.getName() + " " + input + "HP hinzugefügt!"); diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPMaxCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPMaxCommand.java index 5515002..a7c95aa 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPMaxCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPMaxCommand.java @@ -25,8 +25,8 @@ double next = args.getNext(-1.0); if (next > 0) { for (Player pp : Bukkit.getOnlinePlayers()) { - pp.getAttribute(Attribute.GENERIC_MAX_HEALTH).setBaseValue(next); - pp.setHealth(pp.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()); + pp.getAttribute(Attribute.MAX_HEALTH).setBaseValue(next); + pp.setHealth(pp.getAttribute(Attribute.MAX_HEALTH).getValue()); } plugin.getComponentUtil().sendNormalMessage(sender, "Du hast die maximalen HP auf " + next + " gesetzt!"); diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPRemoveCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPRemoveCommand.java index caf4f19..dd74811 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPRemoveCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPRemoveCommand.java @@ -33,7 +33,7 @@ if (args.hasNext()) { double input = args.getNext(0.0); double finalRemoveHP = player.getHealth() - input; - if (finalRemoveHP <= player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() && finalRemoveHP >= 0) { + if (finalRemoveHP <= player.getAttribute(Attribute.MAX_HEALTH).getValue() && finalRemoveHP >= 0) { player.setHealth(finalRemoveHP); plugin.getComponentUtil().sendNormalMessage(player, sender.getName() + " hat dir " + input + " HP entfernt!"); plugin.getComponentUtil().sendNormalMessage(sender, "Du hast " + player.getName() + " " + input + " HP entfernt!"); diff --git a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPSetCommand.java b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPSetCommand.java index ff94914..0abd9b7 100644 --- a/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPSetCommand.java +++ b/Challenge/src/main/java/de/fanta/challenge/commands/hp/HPSetCommand.java @@ -32,7 +32,7 @@ if (args.hasNext()) { double input = args.getNext(0.0); - if (input <= player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() && input >= 0) { + if (input <= player.getAttribute(Attribute.MAX_HEALTH).getValue() && input >= 0) { player.setHealth(input); plugin.getComponentUtil().sendNormalMessage(player, sender.getName() + " hat deine HP auf " + input + " gesetzt!"); plugin.getComponentUtil().sendNormalMessage(sender, "Du hast die HP von " + player.getName() + " auf " + input + " gesetzt!"); diff --git a/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/NoSneakSettingsGui.java b/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/NoSneakSettingsGui.java index 504ec4c..e335c8e 100644 --- a/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/NoSneakSettingsGui.java +++ b/Challenge/src/main/java/de/fanta/challenge/guis/challengesettingsguis/NoSneakSettingsGui.java @@ -45,7 +45,7 @@ double damage = Config.getDouble("sneakdmg"); double maxdamage; if (plugin.getCurrentEditor() != null) { - maxdamage = plugin.getCurrentEditor().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() - 1.0; + maxdamage = plugin.getCurrentEditor().getAttribute(Attribute.MAX_HEALTH).getValue() - 1.0; } else { maxdamage = 20.0; } diff --git a/Challenge/src/main/resources/plugin.yml b/Challenge/src/main/resources/plugin.yml index ec8ad37..cbd9599 100644 --- a/Challenge/src/main/resources/plugin.yml +++ b/Challenge/src/main/resources/plugin.yml @@ -4,7 +4,7 @@ author: ${project.author} api-version: 1.16 depend: [CubesideUtils, VanishNoPacket, GlobalPort, CubesideNMSUtils, PlayerUUIDCache, ChallengeUtils] -softdepend: [CubesideStatistics, AdvancedReplay] +softdepend: [CubesideStatistics] commands: hp: description: Verwalte die HP eines Spielers