Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-02 00:30:07 +01:00
Code Issues Projects Releases Wiki Activity

Fixing remaining NPEs with custom blocks using vanilla IDs.

Browse Source
This commit is contained in:
Glitchfinder 2012-12-28 21:11:22 -08:00
parent cd5df82d72
commit cafed2d98c
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/skills/gathering/Mining.java
View File

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

44
src/main/java/com/gmail/nossr50/util/ModChecks.java
View File

@ -76,11 +76,14 @@ public class ModChecks {
item.setData(new MaterialData(block.getTypeId(), block.getData())); item.setData(new MaterialData(block.getTypeId(), block.getData()));
if (customBlocksEnabled && blocksInstance.customMiningBlocks.contains(item)) { if (customBlocksEnabled && blocksInstance.customMiningBlocks.contains(item)) {
return true; for (CustomBlock b : blocksInstance.customBlocks) {
} if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) {
else { return true;
return false; }
}
} }
return false;
} }
/** /**
@ -94,11 +97,14 @@ public class ModChecks {
item.setData(new MaterialData(block.getTypeId(), block.getData())); item.setData(new MaterialData(block.getTypeId(), block.getData()));
if (blocksInstance.customLeaves.contains(item)) { if (blocksInstance.customLeaves.contains(item)) {
return true; for (CustomBlock b : blocksInstance.customBlocks) {
} if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) {
else { return true;
return false; }
}
} }
return false;
} }
/** /**
@ -112,11 +118,14 @@ public class ModChecks {
item.setData(new MaterialData(block.getTypeId(), block.getData())); item.setData(new MaterialData(block.getTypeId(), block.getData()));
if (blocksInstance.customLogs.contains(item)) { if (blocksInstance.customLogs.contains(item)) {
return true; for (CustomBlock b : blocksInstance.customBlocks) {
} if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) {
else { return true;
return false; }
}
} }
return false;
} }
/** /**
@ -130,11 +139,14 @@ public class ModChecks {
item.setData(new MaterialData(block.getTypeId(), block.getData())); item.setData(new MaterialData(block.getTypeId(), block.getData()));
if (blocksInstance.customOres.contains(item)) { if (blocksInstance.customOres.contains(item)) {
return true; for (CustomBlock b : blocksInstance.customBlocks) {
} if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) {
else { return true;
return false; }
}
} }
return false;
} }
/** /**