Forráskód Böngészése

Fixing more NPEs with custom blocks.

Glitchfinder 12 éve
szülő
commit
cd5df82d72

+ 2 - 2
src/main/java/com/gmail/nossr50/skills/gathering/Mining.java

@@ -219,7 +219,7 @@ public class Mining {
             break;
 
         default:
-            if (ModChecks.isCustomMiningBlock(block)) {
+            if (ModChecks.isCustomMiningBlock(block) && ModChecks.getCustomBlock(block) != null) {
                 CustomBlock customBlock = ModChecks.getCustomBlock(block);
                 int minimumDropAmount = customBlock.getMinimumDropAmount();
                 int maximumDropAmount = customBlock.getMaximumDropAmount();
@@ -365,7 +365,7 @@ public class Mining {
         int durabilityLoss = Config.getInstance().getAbilityToolDamage();
         FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);
 
-        if (ModChecks.isCustomMiningBlock(block)) {
+        if (ModChecks.isCustomMiningBlock(block) && ModChecks.getCustomBlock(block) != null) {
             if (ModChecks.getCustomBlock(block).getTier() < tier) {
                 return;
             }