瀏覽代碼

Merge branch 'configurable' of github.com:mcMMO-Dev/mcmmo into configurable

nossr50 5 年之前
父節點
當前提交
46e285bf44

+ 0 - 1
mcmmo-core/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java

@@ -82,7 +82,6 @@ public class MiningCommand extends SkillCommand {
 
         if (canBlast) {
             messages.add(getStatMessage(false, true, SubSkillType.MINING_BLAST_MINING, String.valueOf(blastMiningRank), String.valueOf(pluginRef.getRankTools().getHighestRank(SubSkillType.MINING_BLAST_MINING)), pluginRef.getLocaleManager().getString("SuperAbility.BlastMining.Effect", oreBonus, bonusTNTDrops)));
-            //messages.add(pluginRef.getLocaleManager().getString("SuperAbility.BlastMining.Rank", blastMiningRank, RankUtils.getHighestRank(SubSkillType.MINING_BLAST_MINING), pluginRef.getLocaleManager().getString("SuperAbility.BlastMining.Effect", oreBonus, debrisReduction, bonusTNTDrops)));
         }
 
         if (canDemoExpert) {

+ 0 - 2
mcmmo-core/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java

@@ -202,8 +202,6 @@ public class MiningManager extends SkillManager {
 
         //Replace the event blocklist with the newYield list
         event.setYield(0F);
-//        event.blockList().clear();
-//        event.blockList().addAll(notOres);
 
         applyXpGain(xp, XPGainReason.PVE);
     }

+ 1 - 0
mcmmo-core/src/main/resources/com/gmail/nossr50/locale/locale_ko.properties

@@ -207,6 +207,7 @@ SuperAbility.BlastMining.Radius.Increase=\uD3ED\uBC1C \uBC18\uACBD \uC99D\uAC00:
 SuperAbility.BlastMining.Rank=\uD3ED\uBC1C \uCC44\uAD74: [[YELLOW]]{0}/8\uB7AD\uD06C [[GRAY]]({1})
 SuperAbility.BlastMining.Other.On=[[GREEN]]{0}[[DARK_GREEN]]\uB2D8\uC740 [[RED]]\uD3ED\uBC1C \uCC44\uAD74\uC744 \uC0AC\uC6A9\uD558\uC168\uC2B5\uB2C8\uB2E4!
 SuperAbility.BlastMining.Refresh=[[GREEN]]\uB2F9\uC2E0\uC758 [[YELLOW]]\uD3ED\uBC1C \uCC44\uAD74 [[GREEN]]\uAE30\uC220\uC740 \uC774\uC81C \uC0AC\uC6A9 \uAC00\uB2A5\uD569\uB2C8\uB2E4!
+
 #REPAIR
 Repair.SubSkill.Repair.Name=\uC218\uB9AC
 Repair.SubSkill.Repair.Description=\uB3C4\uAD6C & \uBC29\uC5B4\uAD6C \uC218\uB9AC