From c8d2bea162dd064018a7af0745d8fc258999ae99 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sun, 4 Oct 2020 12:16:32 +0200 Subject: [PATCH] Maybe now? :eyes: --- .../slimefun4/implementation/items/tools/ClimbingPick.java | 1 - .../tests/items/implementations/tools/TestClimbingPick.java | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ClimbingPick.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ClimbingPick.java index 7f3163d96..ab20d3032 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ClimbingPick.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ClimbingPick.java @@ -124,7 +124,6 @@ public class ClimbingPick extends SimpleSlimefunItem implements ClimbableSurface surface = surfaces.get(type); if (surface != null) { - System.out.println(surface.getValue()); return surface.getValue(); } else { diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java index ae47a7483..b1fb1ec00 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java @@ -64,7 +64,6 @@ class TestClimbingPick implements SlimefunItemTest { } SlimefunItemStack item = new SlimefunItemStack(id, Material.IRON_PICKAXE, "&5Test Pick"); - ClimbingPick pick = new ClimbingPick(TestUtilities.getCategory(plugin, "climbing_pick"), item, RecipeType.NULL, new ItemStack[9]) { @Override @@ -75,6 +74,7 @@ class TestClimbingPick implements SlimefunItemTest { }; pick.register(plugin); + Assertions.assertFalse(pick.getClimbableSurfaces().isEmpty()); return pick; } @@ -124,7 +124,6 @@ class TestClimbingPick implements SlimefunItemTest { @DisplayName("Test Climbing Pick on various Block Faces") @EnumSource(value = BlockFace.class, names = { "UP", "DOWN", "NORTH", "EAST", "SOUTH", "WEST" }) void testItemUse(BlockFace face) { - server.getPluginManager().clearEvents(); PlayerMock player = server.addPlayer(); ClimbingPick pick = registerSlimefunItem(plugin, "TEST_CLIMBING_PICK_" + face.name()); Location blockLocation = new Location(player.getLocation().getWorld(), player.getLocation().getBlockX() + 1, player.getLocation().getBlockY(), player.getLocation().getBlockZ()); @@ -137,7 +136,7 @@ class TestClimbingPick implements SlimefunItemTest { if (shouldFireEvent) { Assertions.assertTrue(pick.getClimbingSpeed(block.getType()) > 0); Assertions.assertTrue(player.getVelocity().length() > 0); - server.getPluginManager().assertEventFired(ClimbingPickLaunchEvent.class); + server.getPluginManager().assertEventFired(ClimbingPickLaunchEvent.class, e -> e.getPlayer() == player && e.getPick() == pick); } else { Assertions.assertEquals(0, player.getVelocity().length());