From e8c015790fc11cf6397c571faf4cdcc99c1b65c1 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Sat, 1 Mar 2025 00:05:45 +0100 Subject: [PATCH] Fix Trapper using Tank constructor. Replaced the use of Tank with Trapper in the TrapperCreator class and adjusted associated parameters. Modified Trapper's constructor to be public, ensuring proper accessibility for instantiation. --- .../com/alttd/ctf/game_class/creation/TrapperCreator.java | 6 +++--- .../com/alttd/ctf/game_class/implementations/Trapper.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/alttd/ctf/game_class/creation/TrapperCreator.java b/src/main/java/com/alttd/ctf/game_class/creation/TrapperCreator.java index adad33e..b7020da 100644 --- a/src/main/java/com/alttd/ctf/game_class/creation/TrapperCreator.java +++ b/src/main/java/com/alttd/ctf/game_class/creation/TrapperCreator.java @@ -1,7 +1,7 @@ package com.alttd.ctf.game_class.creation; import com.alttd.ctf.game_class.GameClass; -import com.alttd.ctf.game_class.implementations.Tank; +import com.alttd.ctf.game_class.implementations.Trapper; import com.alttd.ctf.team.TeamColor; import lombok.extern.slf4j.Slf4j; import net.kyori.adventure.text.minimessage.MiniMessage; @@ -21,8 +21,8 @@ public class TrapperCreator { @Contract("_ -> new") public static @NotNull GameClass createTrapper(@NotNull TeamColor teamColor) { - return new Tank(getArmor(), getTools(teamColor), getDisplayItem(teamColor), - 20, 7, 4); + return new Trapper(getArmor(), getTools(teamColor), getDisplayItem(teamColor), + 20, 5, 4); } @Contract(value = " -> new", pure = true) diff --git a/src/main/java/com/alttd/ctf/game_class/implementations/Trapper.java b/src/main/java/com/alttd/ctf/game_class/implementations/Trapper.java index 6144800..1270d3b 100644 --- a/src/main/java/com/alttd/ctf/game_class/implementations/Trapper.java +++ b/src/main/java/com/alttd/ctf/game_class/implementations/Trapper.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; public class Trapper extends GameClass { - protected Trapper(@NotNull List armor, @NotNull List tools, @NotNull ItemStack displayItem, + public Trapper(@NotNull List armor, @NotNull List tools, @NotNull ItemStack displayItem, double health, int throwTickSpeed, int damage) { super(armor, tools, displayItem, health, throwTickSpeed, damage); }