This function gets the ceiling of the max size of an entity, thus calculating the smallest box, using whole - * blocks as unit, needed to contain the entity. Assuming n is returned, an (n x n) box is needed to contain the + * blocks as unit, needed to contain the entity. Assuming n is returned, an (n x n) box is needed to contain the * entity.
* * @param entityThe entity to get max size for
diff --git a/src/main/java/net/knarcraft/stargate/utility/FileHelper.java b/src/main/java/net/knarcraft/stargate/utility/FileHelper.java index a893946..c0be420 100644 --- a/src/main/java/net/knarcraft/stargate/utility/FileHelper.java +++ b/src/main/java/net/knarcraft/stargate/utility/FileHelper.java @@ -26,7 +26,7 @@ public final class FileHelper { /** * Gets an input stream from a string pointing to an internal file - * + * *This is used for getting an input stream for reading a file contained within the compiled .jar file. The file * should be in the resources directory, and the file path should start with a forward slash ("/") character.
* diff --git a/src/main/java/net/knarcraft/stargate/utility/PermissionHelper.java b/src/main/java/net/knarcraft/stargate/utility/PermissionHelper.java index 47d0e0a..d647224 100644 --- a/src/main/java/net/knarcraft/stargate/utility/PermissionHelper.java +++ b/src/main/java/net/knarcraft/stargate/utility/PermissionHelper.java @@ -47,7 +47,7 @@ public final class PermissionHelper { } //Deny access if another player has activated the portal, and it's still in use - if (!portal.getOptions().isFixed() && portal.getPortalActivator().isActive() && + if (!portal.getOptions().isFixed() && portal.getPortalActivator().isActive() && portal.getActivePlayer() != player) { Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg")); return; @@ -95,7 +95,7 @@ public final class PermissionHelper { */ public static boolean cannotAccessPortal(Player player, Portal entrancePortal, Portal destination) { boolean deny = false; - + if (entrancePortal.getOptions().isBungee()) { if (!PermissionHelper.canAccessServer(player, entrancePortal.getNetwork())) { //If the portal is a bungee portal, and the player cannot access the server, deny @@ -135,7 +135,7 @@ public final class PermissionHelper { /** * Check if a player has been given a permission implicitly * - *This should be run if a player has a parent permission to check for the child permission. It is assumed the + *
This should be run if a player has a parent permission to check for the child permission. It is assumed the * player has the child permission unless it's explicitly set to false.
* * @param playerThe player to check
@@ -150,7 +150,7 @@ public final class PermissionHelper { return true; } if (Stargate.getStargateConfig().isPermissionDebuggingEnabled()) { - Stargate.debug("hasPermissionImplicit::Permission", permission + " => " + + Stargate.debug("hasPermissionImplicit::Permission", permission + " => " + player.hasPermission(permission)); } return player.hasPermission(permission); @@ -338,12 +338,12 @@ public final class PermissionHelper { */ public static boolean canDestroyPortal(Player player, Portal portal) { String network = portal.getNetwork(); - + //Use a special check for bungee portals if (portal.getOptions().isBungee()) { return hasPermission(player, "stargate.admin.bungee"); } - + //Check if the player is allowed to destroy on all networks if (hasPermission(player, "stargate.destroy.network")) { //Check if the network has been explicitly denied diff --git a/src/test/java/net/knarcraft/stargate/utility/MaterialHelperTest.java b/src/test/java/net/knarcraft/stargate/utility/MaterialHelperTest.java index c5edb92..f8481b2 100644 --- a/src/test/java/net/knarcraft/stargate/utility/MaterialHelperTest.java +++ b/src/test/java/net/knarcraft/stargate/utility/MaterialHelperTest.java @@ -13,12 +13,12 @@ public class MaterialHelperTest { public static void setUp() { MockBukkit.mock(); } - + @AfterAll public static void tearDown() { MockBukkit.unmock(); } - + @Test public void isWallCoralTest() { Assertions.assertTrue(MaterialHelper.isWallCoral(Material.DEAD_BRAIN_CORAL_WALL_FAN)); @@ -31,12 +31,12 @@ public class MaterialHelperTest { Assertions.assertTrue(MaterialHelper.isWallCoral(Material.HORN_CORAL_WALL_FAN)); Assertions.assertTrue(MaterialHelper.isWallCoral(Material.DEAD_TUBE_CORAL_WALL_FAN)); Assertions.assertTrue(MaterialHelper.isWallCoral(Material.TUBE_CORAL_WALL_FAN)); - + Assertions.assertFalse(MaterialHelper.isWallCoral(Material.DEAD_TUBE_CORAL)); Assertions.assertFalse(MaterialHelper.isWallCoral(Material.TUBE_CORAL)); Assertions.assertFalse(MaterialHelper.isWallCoral(Material.TUBE_CORAL_BLOCK)); } - + @Test public void isButtonCompatibleTest() { Assertions.assertTrue(MaterialHelper.isButtonCompatible(Material.DEAD_BRAIN_CORAL_WALL_FAN)); @@ -82,9 +82,9 @@ public class MaterialHelperTest { Assertions.assertTrue(MaterialHelper.isButtonCompatible(Material.CHEST)); Assertions.assertTrue(MaterialHelper.isButtonCompatible(Material.ENDER_CHEST)); Assertions.assertTrue(MaterialHelper.isButtonCompatible(Material.TRAPPED_CHEST)); - + //Chek something random to make sure isButtonCompatible is not just "return true;" Assertions.assertFalse(MaterialHelper.isButtonCompatible(Material.OAK_LOG)); } - + }