diff --git a/pom.xml b/pom.xml
index 46a4f0863..f70086d01 100755
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
org.bukkit
bukkit
- 1.12-pre2-SNAPSHOT
+ 1.12.1-R0.1-SNAPSHOT
provided
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..59e8b93cc 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;
@@ -649,6 +649,6 @@ public class FishingManager extends SkillManager {
}
}
- return 0;
+ return 1;
}
}
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..3f3d10e83 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);
}
}
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