EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
nossr50
2019-04-04 00:24:34 -07:00
parent 5b2720a04f b8b0be71b1
commit 6cad982969
7 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/config/Config.java
View File

@ -210,8 +210,6 @@ public abstract class Config implements VersionedConfig, Unload {
return getDefaultConfigFile();
}
/**
* Attemps to load the config file if it exists, if it doesn't it copies a new one from within the JAR
* @return user config File

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

@ -11,10 +11,7 @@ import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.runnables.skills.AbilityCooldownTask;
import com.gmail.nossr50.skills.SkillManager;
import com.gmail.nossr50.util.BlockUtils;
import com.gmail.nossr50.util.EventUtils;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.Permissions;
import com.gmail.nossr50.util.*;
import com.gmail.nossr50.util.player.NotificationManager;
import com.gmail.nossr50.util.random.RandomChanceUtil;
import com.gmail.nossr50.util.skills.RankUtils;
@ -45,7 +42,9 @@ public class MiningManager extends SkillManager {
public boolean canDetonate() {
Player player = getPlayer();
return canUseBlastMining() && player.isSneaking() && player.getInventory().getItemInMainHand().getType() == BlastMining.detonator && Permissions.remoteDetonation(player);
return canUseBlastMining() && player.isSneaking()
&& ItemUtils.isPickaxe(getPlayer().getInventory().getItemInMainHand())
&& Permissions.remoteDetonation(player);
}
public boolean canUseBlastMining() {

3
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -451,6 +451,9 @@ public final class CombatUtils {
}
target.setMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY, mcMMO.metadataValue);
target.damage(damage, attacker);
// //IFrame storage