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

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

@ -76,13 +76,16 @@ public class ModChecks {
item.setData(new MaterialData(block.getTypeId(), block.getData()));
if (customBlocksEnabled && blocksInstance.customMiningBlocks.contains(item)) {
for (CustomBlock b : blocksInstance.customBlocks) {
if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) {
return true;
}
else {
return false;
}
}
return false;
}
/**
* Check if a custom block is a leaf block.
*
@ -94,13 +97,16 @@ public class ModChecks {
item.setData(new MaterialData(block.getTypeId(), block.getData()));
if (blocksInstance.customLeaves.contains(item)) {
for (CustomBlock b : blocksInstance.customBlocks) {
if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) {
return true;
}
else {
return false;
}
}
return false;
}
/**
* Check if a custom block is a log block.
*
@ -112,13 +118,16 @@ public class ModChecks {
item.setData(new MaterialData(block.getTypeId(), block.getData()));
if (blocksInstance.customLogs.contains(item)) {
for (CustomBlock b : blocksInstance.customBlocks) {
if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) {
return true;
}
else {
return false;
}
}
return false;
}
/**
* Check if a custom block is an ore block.
*
@ -130,13 +139,16 @@ public class ModChecks {
item.setData(new MaterialData(block.getTypeId(), block.getData()));
if (blocksInstance.customOres.contains(item)) {
for (CustomBlock b : blocksInstance.customBlocks) {
if ((b.getItemID() == block.getTypeId()) && (b.getDataValue() == block.getData())) {
return true;
}
else {
return false;
}
}
return false;
}
/**
* Checks to see if an item is a custom tool.
*