From c73bf8bad74e16ecb5b4d4b435464d8e7d8d93b3 Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 7 Nov 2019 15:52:49 -0800 Subject: [PATCH 1/6] Do not register top-level commands if config setting isn't true https://github.com/BentoBoxWorld/Warps/issues/57 --- pom.xml | 2 +- src/main/java/world/bentobox/warps/Warp.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f9d2ba1..afb91bf 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ -LOCAL - 1.8.1 + 1.8.2 diff --git a/src/main/java/world/bentobox/warps/Warp.java b/src/main/java/world/bentobox/warps/Warp.java index 482fe79..225f96c 100644 --- a/src/main/java/world/bentobox/warps/Warp.java +++ b/src/main/java/world/bentobox/warps/Warp.java @@ -83,7 +83,7 @@ public class Warp extends Addon { // Save default config.yml this.saveDefaultConfig(); // Load the plugin's config - if (this.loadSettings()) { + if (this.loadSettings() && settings.isAllowInOtherWorlds()) { // Load the master warp and warps command new WarpCommand(this); new WarpsCommand(this); From eb0930757c52f297d0aad86986fb0ba2da56e0fa Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 7 Nov 2019 16:52:39 -0800 Subject: [PATCH 2/6] Removed sonar_token reference from travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b76061a..9c5b6e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,7 @@ sudo: false addons: sonarcloud: organization: "bentobox-world" - token: - secure: $SONAR_TOKEN + jdk: - openjdk8 - openjdk11 From ae1c2fe96f727ae30c4397ee06c0913588262f79 Mon Sep 17 00:00:00 2001 From: tastybento Date: Mon, 11 Nov 2019 07:57:55 -0800 Subject: [PATCH 3/6] Use BentoBox utility method for BlockFaceToFloat --- .../bentobox/warps/WarpSignsManager.java | 48 +------------------ 1 file changed, 1 insertion(+), 47 deletions(-) diff --git a/src/main/java/world/bentobox/warps/WarpSignsManager.java b/src/main/java/world/bentobox/warps/WarpSignsManager.java index da6040c..b3adb62 100644 --- a/src/main/java/world/bentobox/warps/WarpSignsManager.java +++ b/src/main/java/world/bentobox/warps/WarpSignsManager.java @@ -317,7 +317,7 @@ public class WarpSignsManager { */ private void warpPlayer(@NonNull User user, @NonNull Location inFront, @NonNull UUID signOwner, @NonNull BlockFace directionFacing, boolean pvp) { // convert blockface to angle - float yaw = blockFaceToFloat(directionFacing); + float yaw = Util.blockFaceToFloat(directionFacing); final Location actualWarp = new Location(inFront.getWorld(), inFront.getBlockX() + 0.5D, inFront.getBlockY(), inFront.getBlockZ() + 0.5D, yaw, 30F); user.teleport(actualWarp); @@ -333,52 +333,6 @@ public class WarpSignsManager { } } - /** - * Converts block face direction to radial degrees. Returns 0 if block face - * is not radial. - * - * @param face - * @return degrees - */ - private float blockFaceToFloat(@NonNull BlockFace face) { - switch (face) { - case EAST: - return 90F; - case EAST_NORTH_EAST: - return 67.5F; - case EAST_SOUTH_EAST: - return 0F; - case NORTH: - return 0F; - case NORTH_EAST: - return 45F; - case NORTH_NORTH_EAST: - return 22.5F; - case NORTH_NORTH_WEST: - return 337.5F; - case NORTH_WEST: - return 315F; - case SOUTH: - return 180F; - case SOUTH_EAST: - return 135F; - case SOUTH_SOUTH_EAST: - return 157.5F; - case SOUTH_SOUTH_WEST: - return 202.5F; - case SOUTH_WEST: - return 225F; - case WEST: - return 270F; - case WEST_NORTH_WEST: - return 292.5F; - case WEST_SOUTH_WEST: - return 247.5F; - default: - return 0F; - } - } - /** * Warps a user to the warp owner by owner * From c361f0a1a3a9604701fa9563f382fc9c156a8ddc Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 16 Nov 2019 18:32:08 -0800 Subject: [PATCH 4/6] Create ro.yml --- src/main/resources/locales/ro.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/main/resources/locales/ro.yml diff --git a/src/main/resources/locales/ro.yml b/src/main/resources/locales/ro.yml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/main/resources/locales/ro.yml @@ -0,0 +1 @@ + From 3dab96e546e7b840b8a2aeb1fc57e0eed089b3b0 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 16 Nov 2019 18:32:16 -0800 Subject: [PATCH 5/6] Create id.yml --- src/main/resources/locales/id.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/main/resources/locales/id.yml diff --git a/src/main/resources/locales/id.yml b/src/main/resources/locales/id.yml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/main/resources/locales/id.yml @@ -0,0 +1 @@ + From 037ca558cfdef6e3afa5a19d2e9591aa07e0eb8d Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 17 Nov 2019 17:44:27 -0800 Subject: [PATCH 6/6] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index b10469f..9231476 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -5,7 +5,7 @@ about: Create a report to help us improve --- **Description** -A clear and concise description of what the bug is. + **Steps to reproduce the behavior:** 1. Go to '...' @@ -14,20 +14,13 @@ A clear and concise description of what the bug is. 4. See error **Expected behavior** -A clear and concise description of what you expected to happen. + **Screenshots** -If applicable, add screenshots to help explain your problem. + **Server Information:** - -[Please complete the following information:] - - Database being used (YAML, JSON, MySQL, MongoDB): [] - - OS: [e.g. iOS] - - Java Version: [e.g. Java 8] - - BentoBox version: [e.g. 1.7.2.21] - - Addons installed? [Do '/bentobox version' and copy/paste from the console] - - Other plugins? [Do '/plugins' and copy/paste from the console] +Do `bbox version` in the console and paste the result here: **Additional context** -Add any other context about the problem here. +