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

Revert blast mining nerf

Browse Source
This commit is contained in:
nossr50 2020-05-05 19:19:20 -07:00
parent 74f8c2901d
commit c5ce7bd23b
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -1,5 +1,6 @@
Version 2.1.128 Version 2.1.128
The first rank of Iron Arm for Unarmed now only gives 1.5 bonus damage instead of 4 (other ranks are the same as before) The first rank of Iron Arm for Unarmed now only gives 1.5 bonus damage instead of 4 (other ranks are the same as before)
Blast Mining nerf reverted
Version 2.1.127 Version 2.1.127

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

@ -161,12 +161,12 @@ public class MiningManager extends SkillManager {
List<BlockState> ores = new ArrayList<BlockState>(); List<BlockState> ores = new ArrayList<BlockState>();
List<Block> notOres = new ArrayList<>(); // List<Block> notOres = new ArrayList<>();
for (Block targetBlock : event.blockList()) { for (Block targetBlock : event.blockList()) {
//Containers usually have 0 XP unless someone edited their config in a very strange way //Containers usually have 0 XP unless someone edited their config in a very strange way
if (ExperienceConfig.getInstance().getXp(PrimarySkillType.MINING, targetBlock) == 0 || targetBlock instanceof Container || mcMMO.getPlaceStore().isTrue(targetBlock)) { if (ExperienceConfig.getInstance().getXp(PrimarySkillType.MINING, targetBlock) != 0
notOres.add(targetBlock); && !(targetBlock instanceof Container)
} else { && !mcMMO.getPlaceStore().isTrue(targetBlock)) {
ores.add(targetBlock.getState()); ores.add(targetBlock.getState());
} }
} }
@ -181,17 +181,18 @@ public class MiningManager extends SkillManager {
// float debrisYield = yield - debrisReduction; // float debrisYield = yield - debrisReduction;
for (BlockState blockState : ores) { for (BlockState blockState : ores) {
if (RandomUtils.nextInt(ores.size()) >= (ores.size() / 2)) { if (RandomUtils.nextFloat() >= (yield + getOreBonus())) {
xp += Mining.getBlockXp(blockState); xp += Mining.getBlockXp(blockState);
Misc.dropItem(Misc.getBlockCenter(blockState), new ItemStack(blockState.getType())); // Initial block that would have been dropped Misc.dropItem(Misc.getBlockCenter(blockState), new ItemStack(blockState.getType())); // Initial block that would have been dropped
if (!mcMMO.getPlaceStore().isTrue(blockState)) {
for (int i = 1; i < dropMultiplier; i++) { for (int i = 1; i < dropMultiplier; i++) {
if(RandomUtils.nextInt(100) >= 75)
Mining.handleSilkTouchDrops(blockState); // Bonus drops - should drop the block & not the items Mining.handleSilkTouchDrops(blockState); // Bonus drops - should drop the block & not the items
} }
} }
} }
}
//Replace the event blocklist with the newYield list //Replace the event blocklist with the newYield list
event.setYield(0F); event.setYield(0F);