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 #1 from ezeiger92/many-fixes

Browse Source 
Pull in fixes
This commit is contained in:
Erik 2017-08-15 21:44:49 -07:00 committed by GitHub
commit a731ad14ec
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -135,7 +135,7 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
<version>1.12-pre2-SNAPSHOT</version> <version>1.12.1-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

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);

6
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;
@ -649,6 +649,6 @@ public class FishingManager extends SkillManager {
} }
} }
return 0; return 1;
} }
} }

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);
} }
} }

4
src/main/resources/plugin.yml
View File

@ -340,7 +340,7 @@ permissions:
mcmmo.ability.herbalism.greenthumb.plants.crops: true mcmmo.ability.herbalism.greenthumb.plants.crops: true
mcmmo.ability.herbalism.greenthumb.plants.netherwarts: true mcmmo.ability.herbalism.greenthumb.plants.netherwarts: true
mcmmo.ability.herbalism.greenthumb.plants.potato: 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: mcmmo.ability.herbalism.greenthumb.plants.carrot:
description: Allows access to the Green Thumb ability for carrots description: Allows access to the Green Thumb ability for carrots
mcmmo.ability.herbalism.greenthumb.plants.cocoa: mcmmo.ability.herbalism.greenthumb.plants.cocoa:
@ -351,7 +351,7 @@ permissions:
description: Allows access to the Green Thumb ability for netherwart description: Allows access to the Green Thumb ability for netherwart
mcmmo.ability.herbalism.greenthumb.plants.potato: mcmmo.ability.herbalism.greenthumb.plants.potato:
description: Allows access to the Green Thumb ability for potatoes 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 description: Allows access to the Green Thumb ability for beetrootes
mcmmo.ability.herbalism.hylianluck: mcmmo.ability.herbalism.hylianluck:
description: Allows access to the Hylian Luck ability description: Allows access to the Hylian Luck ability