EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-04-04 18:56:23 +02:00
Code Issues Projects Releases Wiki Activity

Fixed NPE when breaking placed Herbalism blocks.

Browse Source
This commit is contained in:
GJ 2012-03-10 15:43:48 -05:00
parent ce8ddded92
commit 989f12e65b
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/com/gmail/nossr50/skills/Herbalism.java
View File

@ -106,6 +106,7 @@ public class Herbalism {
int herbLevel = PP.getSkillLevel(SkillType.HERBALISM); int herbLevel = PP.getSkillLevel(SkillType.HERBALISM);
int id = block.getTypeId(); int id = block.getTypeId();
Material type = block.getType(); Material type = block.getType();
Byte data = block.getData(); Byte data = block.getData();
Location loc = block.getLocation(); Location loc = block.getLocation();
Material mat = null; Material mat = null;
@ -208,30 +209,35 @@ public class Herbalism {
break; break;
} }
ItemStack is = new ItemStack(mat); if (mat == null) {
return;
if (herbLevel > 1000 || (Math.random() * 1000 <= herbLevel)) {
if (type.equals(Material.CACTUS)) {
m.mcDropItems(loc, is, catciDrops);
}
else if (type.equals(Material.MELON_BLOCK)) {
m.mcDropItems(loc, is, 3);
m.mcRandomDropItems(loc, is, 50, 4);
}
else if (type.equals(Material.NETHER_WARTS)) {
m.mcDropItems(loc, is, 2);
m.mcRandomDropItems(loc, is, 50, 3);
}
else if (type.equals(Material.SUGAR_CANE_BLOCK)) {
m.mcDropItems(loc, is, caneDrops);
}
else {
m.mcDropItem(loc, is);
}
} }
else {
ItemStack is = new ItemStack(mat);
PP.addXP(SkillType.HERBALISM, xp, player); if (herbLevel > 1000 || (Math.random() * 1000 <= herbLevel)) {
Skills.XpCheckSkill(SkillType.HERBALISM, player); if (type.equals(Material.CACTUS)) {
m.mcDropItems(loc, is, catciDrops);
}
else if (type.equals(Material.MELON_BLOCK)) {
m.mcDropItems(loc, is, 3);
m.mcRandomDropItems(loc, is, 50, 4);
}
else if (type.equals(Material.NETHER_WARTS)) {
m.mcDropItems(loc, is, 2);
m.mcRandomDropItems(loc, is, 50, 3);
}
else if (type.equals(Material.SUGAR_CANE_BLOCK)) {
m.mcDropItems(loc, is, caneDrops);
}
else {
m.mcDropItem(loc, is);
}
}
PP.addXP(SkillType.HERBALISM, xp, player);
Skills.XpCheckSkill(SkillType.HERBALISM, player);
}
} }
/** /**