EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 15:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3252 from ezeiger92/fix-3250

Browse Source 
Fix 3250
This commit is contained in:
t00thpick1 2017-08-31 00:02:37 -04:00 committed by GitHub
commit 8be68aa6df
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
View File

@ -240,7 +240,7 @@ public class PlayerListener implements Listener {
return; return;
case IN_GROUND: case IN_GROUND:
Block block = player.getTargetBlock((HashSet<Byte>) null, 100); Block block = player.getTargetBlock((HashSet<Material>) null, 100);
if (fishingManager.canIceFish(block)) { if (fishingManager.canIceFish(block)) {
event.setCancelled(true); event.setCancelled(true);

4
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
View File

@ -104,7 +104,7 @@ public class FishingManager extends SkillManager {
vehicle.remove(); vehicle.remove();
} }
player.teleport(player.getTargetBlock((HashSet<Byte>) null, 100).getLocation(), TeleportCause.PLUGIN); player.teleport(player.getTargetBlock((HashSet<Material>) null, 100).getLocation(), TeleportCause.PLUGIN);
String unleashMessage = AdvancedConfig.getInstance().getPlayerUnleashMessage(); String unleashMessage = AdvancedConfig.getInstance().getPlayerUnleashMessage();
@ -167,7 +167,7 @@ public class FishingManager extends SkillManager {
return false; return false;
} }
Block targetBlock = getPlayer().getTargetBlock((HashSet<Byte>) BlockUtils.getTransparentBlocks(), 100); Block targetBlock = getPlayer().getTargetBlock((HashSet<Material>) BlockUtils.getTransparentBlocks(), 100);
if (!targetBlock.isLiquid()) { if (!targetBlock.isLiquid()) {
return false; return false;

2
src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
View File

@ -94,7 +94,7 @@ public class MiningManager extends SkillManager {
*/ */
public void remoteDetonation() { public void remoteDetonation() {
Player player = getPlayer(); Player player = getPlayer();
Block targetBlock = player.getTargetBlock((HashSet<Byte>) BlockUtils.getTransparentBlocks(), BlastMining.MAXIMUM_REMOTE_DETONATION_DISTANCE); Block targetBlock = player.getTargetBlock((HashSet<Material>) BlockUtils.getTransparentBlocks(), BlastMining.MAXIMUM_REMOTE_DETONATION_DISTANCE);
if (targetBlock.getType() != Material.TNT || !EventUtils.simulateBlockBreak(targetBlock, player, true) || !blastMiningCooldownOver()) { if (targetBlock.getType() != Material.TNT || !EventUtils.simulateBlockBreak(targetBlock, player, true) || !blastMiningCooldownOver()) {
return; return;

6
src/main/java/com/gmail/nossr50/util/BlockUtils.java
View File

@ -305,12 +305,12 @@ public final class BlockUtils {
* *
* @return HashSet with the IDs of every transparent block * @return HashSet with the IDs of every transparent block
*/ */
public static HashSet<Byte> getTransparentBlocks() { public static HashSet<Material> getTransparentBlocks() {
HashSet<Byte> transparentBlocks = new HashSet<Byte>(); HashSet<Material> transparentBlocks = new HashSet<Material>();
for (Material material : Material.values()) { for (Material material : Material.values()) {
if (material.isTransparent()) { if (material.isTransparent()) {
transparentBlocks.add((byte) material.getId()); transparentBlocks.add(material);
} }
} }