diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml new file mode 100644 index 0000000..20d0cb0 --- /dev/null +++ b/dependency-reduced-pom.xml @@ -0,0 +1,114 @@ + + + 4.0.0 + de.fanta.challenges + Challenges + 1.17.1-DEV + + + + true + src/main/resources + + + + + maven-jar-plugin + 3.2.0 + + ${project.artifactId}-${project.version} + + + + maven-shade-plugin + + + package + + shade + + + + + ${project.groupId}.Challenges + + + + + + + + maven-compiler-plugin + 3.8.1 + + 16 + + + + maven-compiler-plugin + + 16 + 16 + + + + + + + papermc + https://papermc.io/repo/repository/maven-public/ + + + brokkonaut + https://www.iani.de/nexus/content/groups/public + + + viaversion-repo + https://repo.viaversion.com + + + + + io.papermc.paper + paper-api + 1.17.1-R0.1-SNAPSHOT + provided + + + de.iani.cubeside + CubesideUtilsBukkit + 1.16-SNAPSHOT + provided + + + de.iani.cubeside + GlobalPort + 0.0.1-SNAPSHOT + provided + + + org.kitteh + VanishNoPacket + 3.20.1 + provided + + + de.cubeside.nmsutils + nmsutils-plugin + 0.0.1-SNAPSHOT + provided + + + com.viaversion + viaversion-api + LATEST + provided + + + + UTF-8 + ${project.groupId}.Challenges + UTF-8 + fanta, vollkorntomate + + diff --git a/src/main/java/de/fanta/challenges/challenges/TiedTogetherChallenge.java b/src/main/java/de/fanta/challenges/challenges/TiedTogetherChallenge.java index 9e6ed9d..3c8b932 100644 --- a/src/main/java/de/fanta/challenges/challenges/TiedTogetherChallenge.java +++ b/src/main/java/de/fanta/challenges/challenges/TiedTogetherChallenge.java @@ -1,15 +1,12 @@ package de.fanta.challenges.challenges; import de.fanta.challenges.Challenges; -import de.fanta.challenges.utils.ChatUtil; -import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.player.PlayerMoveEvent; public class TiedTogetherChallenge implements Listener { @@ -17,20 +14,6 @@ private static final Challenges plugin = Challenges.getPlugin(); @EventHandler - public void onDeath(PlayerDeathEvent e) { - if (plugin.getConfig().getBoolean("tiedtogether")) { - plugin.getTimer().stopTimer(); - for (Player p : Bukkit.getOnlinePlayers()) { - p.setGameMode(GameMode.SPECTATOR); - } - ChatUtil.sendBrodcastMessage("Ein Spieler hat sich zu weit entfernt! Die Challenge ist verloren!"); - ChatUtil.sendBrodcastMessage("Verschwendete Zeit: " + plugin.getTimer().formatTime(ChatColor.GOLD)); - ChatUtil.sendBrodcastMessage("Welt Seed: " + Bukkit.getWorlds().get(0).getSeed()); - ChatUtil.sendBrodcastMessage("Um alle wiederzubeleben benutze /revive ALL"); - } - } - - @EventHandler public void onMove(PlayerMoveEvent e) { if (plugin.getConfig().getBoolean("tiedtogether") && plugin.getTimer().isRunning()) { calculateDistances(); @@ -75,8 +58,11 @@ Location center = new Location(plugin.getCurrentEditor().getWorld(), xCenter, yCenter, zCenter); if (p.getLocation().distanceSquared(center) > (plugin.getConfig().getDouble("playerrange") / 2) * (plugin.getConfig().getDouble("playerrange") / 2)) { - for (Player player : Bukkit.getOnlinePlayers()) { - player.damage(4); + for (Player pp : Bukkit.getOnlinePlayers()) { + /*Entity armorstand = world.spawnEntity(event.getPlayer().getLocation(), EntityType.ARMOR_STAND); + armorstand.setCustomName("Entfernung"); + pp.damage(4, armorstand);*/ //TODO MÜLL + pp.damage(4); } } }