diff --git a/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java b/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java index 55862fa..8856bc8 100644 --- a/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java +++ b/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java @@ -80,11 +80,11 @@ public class EventRunner implements Runnable { difficulties.add(Difficulty.BABY); } else if (distance <= -2) { difficulties.add(Difficulty.EASY); - } else if (distance <= 1) { + } else if (distance == 0) { difficulties.add(Difficulty.MEDIUM); - } else if (distance <= 3) { + } else if (distance <= 2) { difficulties.add(Difficulty.HARD); - } else if (distance <= 5) { + } else if (distance <= 4) { difficulties.add(Difficulty.SWEAT); } else { difficulties.add(Difficulty.IMPOSSIBLE); diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/FallEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/FallEvent.java index eeeea2e..4cfa88e 100644 --- a/src/main/java/gent/zeus/mc13dtl/events/catalog/FallEvent.java +++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/FallEvent.java @@ -3,6 +3,8 @@ package gent.zeus.mc13dtl.events.catalog; import gent.zeus.mc13dtl.MC13DTL; import gent.zeus.mc13dtl.events.Difficulty; import gent.zeus.mc13dtl.events.Event; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.TextDecoration; import org.bukkit.inventory.ItemStack; import org.bukkit.Location; @@ -50,6 +52,7 @@ public class FallEvent extends Event { for (Player p : MC13DTL.board.getPlayers(team)) { p.teleport(location); p.getInventory().addItem(new ItemStack(Material.WATER_BUCKET)); + p.sendMessage(Component.text("Received a water bucket").decorate(TextDecoration.ITALIC)); } super.start(); diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/RunToSpawnEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/RunToSpawnEvent.java index 655e4f7..2aee6fe 100644 --- a/src/main/java/gent/zeus/mc13dtl/events/catalog/RunToSpawnEvent.java +++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/RunToSpawnEvent.java @@ -21,8 +21,8 @@ import java.util.Random; public class RunToSpawnEvent extends Event { private final int maxRate; - private final int maxDistanceSquared = 800000; - private final int maxZombieDistance = 50; + private final int maxDistanceSquared = 900000; + private final int maxZombieDistance = 30; private final Location spawn = Bukkit.getWorld("world").getSpawnLocation(); private final Random ran = new Random(); private int timeLeft = 60; @@ -32,9 +32,9 @@ public class RunToSpawnEvent extends Event { maxRate = switch (difficulty) { case BABY -> 1; case EASY -> 5; - case MEDIUM -> 15; - case HARD -> 25; - case SWEAT -> 50; + case MEDIUM -> 25; + case HARD -> 40; + case SWEAT -> 75; case IMPOSSIBLE -> 100; }; }