From b5f6b1d97f507a1017d3c69c031adfa89565b2b9 Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 5 Aug 2017 11:50:24 -0700 Subject: [PATCH 1/4] Fix for 3250 - HashSet to HashSet for getTargetBlock --- .../java/com/gmail/nossr50/listeners/PlayerListener.java | 2 +- .../com/gmail/nossr50/skills/fishing/FishingManager.java | 4 ++-- .../java/com/gmail/nossr50/skills/mining/MiningManager.java | 2 +- src/main/java/com/gmail/nossr50/util/BlockUtils.java | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index 8f67f7914..d2ab93e87 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -240,7 +240,7 @@ public class PlayerListener implements Listener { return; case IN_GROUND: - Block block = player.getTargetBlock((HashSet) null, 100); + Block block = player.getTargetBlock((HashSet) null, 100); if (fishingManager.canIceFish(block)) { event.setCancelled(true); diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java index 425239960..6c46047b1 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java @@ -104,7 +104,7 @@ public class FishingManager extends SkillManager { vehicle.remove(); } - player.teleport(player.getTargetBlock((HashSet) null, 100).getLocation(), TeleportCause.PLUGIN); + player.teleport(player.getTargetBlock((HashSet) null, 100).getLocation(), TeleportCause.PLUGIN); String unleashMessage = AdvancedConfig.getInstance().getPlayerUnleashMessage(); @@ -167,7 +167,7 @@ public class FishingManager extends SkillManager { return false; } - Block targetBlock = getPlayer().getTargetBlock((HashSet) BlockUtils.getTransparentBlocks(), 100); + Block targetBlock = getPlayer().getTargetBlock((HashSet) BlockUtils.getTransparentBlocks(), 100); if (!targetBlock.isLiquid()) { return false; diff --git a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java index 62701aca0..0d073af46 100644 --- a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java +++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java @@ -94,7 +94,7 @@ public class MiningManager extends SkillManager { */ public void remoteDetonation() { Player player = getPlayer(); - Block targetBlock = player.getTargetBlock((HashSet) BlockUtils.getTransparentBlocks(), BlastMining.MAXIMUM_REMOTE_DETONATION_DISTANCE); + Block targetBlock = player.getTargetBlock((HashSet) BlockUtils.getTransparentBlocks(), BlastMining.MAXIMUM_REMOTE_DETONATION_DISTANCE); if (targetBlock.getType() != Material.TNT || !EventUtils.simulateBlockBreak(targetBlock, player, true) || !blastMiningCooldownOver()) { return; diff --git a/src/main/java/com/gmail/nossr50/util/BlockUtils.java b/src/main/java/com/gmail/nossr50/util/BlockUtils.java index d54e04808..57580d584 100644 --- a/src/main/java/com/gmail/nossr50/util/BlockUtils.java +++ b/src/main/java/com/gmail/nossr50/util/BlockUtils.java @@ -305,12 +305,12 @@ public final class BlockUtils { * * @return HashSet with the IDs of every transparent block */ - public static HashSet getTransparentBlocks() { - HashSet transparentBlocks = new HashSet(); + public static HashSet getTransparentBlocks() { + HashSet transparentBlocks = new HashSet(); for (Material material : Material.values()) { if (material.isTransparent()) { - transparentBlocks.add((byte) material.getId()); + transparentBlocks.add(material); } } From 0e7ee41444d49791a9e32558e8a1f651097aef2d Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 5 Aug 2017 11:53:38 -0700 Subject: [PATCH 2/4] Follow spacing convention --- src/main/java/com/gmail/nossr50/util/BlockUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gmail/nossr50/util/BlockUtils.java b/src/main/java/com/gmail/nossr50/util/BlockUtils.java index 57580d584..3f3d10e83 100644 --- a/src/main/java/com/gmail/nossr50/util/BlockUtils.java +++ b/src/main/java/com/gmail/nossr50/util/BlockUtils.java @@ -310,7 +310,7 @@ public final class BlockUtils { for (Material material : Material.values()) { if (material.isTransparent()) { - transparentBlocks.add(material); + transparentBlocks.add(material); } } From 60aa32d003e28496a0421c60b8804c88fbef45d1 Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 15 Aug 2017 12:20:09 -0700 Subject: [PATCH 3/4] Patches! * Update bukkit version * Default vanilla exp modifier for fishing is now 1 * Fixed beetroot permission for herbalism --- pom.xml | 2 +- .../java/com/gmail/nossr50/skills/fishing/FishingManager.java | 2 +- src/main/resources/plugin.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 46a4f0863..7d50e93f8 100755 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ org.bukkit bukkit - 1.12-pre2-SNAPSHOT + 1.12-R0.1-SNAPSHOT provided diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java index 6c46047b1..59e8b93cc 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java @@ -649,6 +649,6 @@ public class FishingManager extends SkillManager { } } - return 0; + return 1; } } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 950857056..b8c12d2ff 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -340,7 +340,7 @@ permissions: mcmmo.ability.herbalism.greenthumb.plants.crops: true mcmmo.ability.herbalism.greenthumb.plants.netherwarts: true mcmmo.ability.herbalism.greenthumb.plants.potato: true - mcmmo.ability.herbalism.greenthumb.plants.beetroot: true + mcmmo.ability.herbalism.greenthumb.plants.beetrootblock: true mcmmo.ability.herbalism.greenthumb.plants.carrot: description: Allows access to the Green Thumb ability for carrots mcmmo.ability.herbalism.greenthumb.plants.cocoa: @@ -351,7 +351,7 @@ permissions: description: Allows access to the Green Thumb ability for netherwart mcmmo.ability.herbalism.greenthumb.plants.potato: description: Allows access to the Green Thumb ability for potatoes - mcmmo.ability.herbalism.greenthumb.plants.beetroot: + mcmmo.ability.herbalism.greenthumb.plants.beetrootblock: description: Allows access to the Green Thumb ability for beetrootes mcmmo.ability.herbalism.hylianluck: description: Allows access to the Hylian Luck ability From 05ca96aa7f9b82c0a11e738146033002454768d2 Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 15 Aug 2017 16:45:32 -0700 Subject: [PATCH 4/4] Build against 1.12.1 to NOT break getTargetBlock --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7d50e93f8..f70086d01 100755 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ org.bukkit bukkit - 1.12-R0.1-SNAPSHOT + 1.12.1-R0.1-SNAPSHOT provided