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

Merge pull request #383 from Glitchfinder/master

Browse Source 
Fixing a few more NPEs.
This commit is contained in:
Glitchfinder 2012-12-28 21:11:58 -08:00
commit d35e56fd37
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

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;
} }
/** /**