diff --git a/src/main/java/com/alttd/ctf/events/SnowballEvent.java b/src/main/java/com/alttd/ctf/events/SnowballEvent.java index 04bf1b2..affa31f 100644 --- a/src/main/java/com/alttd/ctf/events/SnowballEvent.java +++ b/src/main/java/com/alttd/ctf/events/SnowballEvent.java @@ -150,10 +150,10 @@ public class SnowballEvent implements Listener { return; } - if (teamPlayerHit.get().getTeam().getId() == teamPlayerShooter.get().getTeam().getId()) { + if (teamPlayerHit.get().getTeam().getId().equals(teamPlayerShooter.get().getTeam().getId())) { log.debug("The shooter hit a member of their own team"); return; } - consumer.apply(hitPlayer, shooter, teamPlayerHit.get(), snowball); + consumer.apply(hitPlayer, shooter, teamPlayerShooter.get(), snowball); } } diff --git a/src/main/java/com/alttd/ctf/game_class/creation/MageCreator.java b/src/main/java/com/alttd/ctf/game_class/creation/MageCreator.java index 538edfd..59b5b9d 100644 --- a/src/main/java/com/alttd/ctf/game_class/creation/MageCreator.java +++ b/src/main/java/com/alttd/ctf/game_class/creation/MageCreator.java @@ -26,7 +26,7 @@ public class MageCreator { @Contract("_ -> new") public static @NotNull GameClass createMage(@NotNull TeamColor teamColor) { return new Mage(getArmor(), getTools(teamColor), getDisplayItem(teamColor), - 20, 100, 3); + 20, 100, 1); } @Contract(value = " -> new", pure = true) diff --git a/src/main/java/com/alttd/ctf/game_class/implementations/Mage.java b/src/main/java/com/alttd/ctf/game_class/implementations/Mage.java index 68e4548..956dc0f 100644 --- a/src/main/java/com/alttd/ctf/game_class/implementations/Mage.java +++ b/src/main/java/com/alttd/ctf/game_class/implementations/Mage.java @@ -50,9 +50,9 @@ public class Mage extends GameClass { snowball.setShooter(shooter); - double velocityChangeX = (Math.random() - 0.5) * 0.2; - double velocityChangeY = (Math.random() - 0.5) * 0.2; - double velocityChangeZ = (Math.random() - 0.5) * 0.2; + double velocityChangeX = (Math.random() - 0.5) * 0.5; + double velocityChangeY = (Math.random() - 0.5) * 0.5; + double velocityChangeZ = (Math.random() - 0.5) * 0.5; Vector newVelocity = velocity.clone().add(new Vector(velocityChangeX, velocityChangeY, velocityChangeZ)); diff --git a/version.properties b/version.properties index a1c2399..c0426d6 100644 --- a/version.properties +++ b/version.properties @@ -1,3 +1,3 @@ -#Sat Mar 01 00:23:05 CET 2025 -buildNumber=86 +#Sat Mar 01 00:39:55 CET 2025 +buildNumber=91 version=0.1