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

Merge pull request #494 from Glitchfinder/master

Browse Source 
Renaming a call to patch new errors.
This commit is contained in:
Glitchfinder 2013-01-13 18:01:23 -08:00
commit 4d1bcf1cc0
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
View File

@ -392,10 +392,13 @@ public class Fishing {
case SQUID: case SQUID:
ItemStack item; ItemStack item;
try { try {
item = (new MaterialData(Material.INK_SACK, DyeColor.BLACK.getDyeData())).toItemStack(1); item = (new MaterialData(Material.INK_SACK, DyeColor.BLACK.getData())).toItemStack(1);
} }
catch(Exception e) { catch(Exception e) {
item = (new MaterialData(Material.INK_SACK, (byte) 0)).toItemStack(1); item = (new MaterialData(Material.INK_SACK, (byte) 0)).toItemStack(1);
}
catch(NoSuchMethodError e) {
item = (new MaterialData(Material.INK_SACK, (byte) 0)).toItemStack(1);
} }
Misc.dropItem(location, item); Misc.dropItem(location, item);

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

@ -266,11 +266,14 @@ public class Herbalism {
else { else {
if (mat == Material.COCOA) { if (mat == Material.COCOA) {
try { try {
is = new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getDyeData()); is = new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getData());
} }
catch (Exception e) { catch (Exception e) {
is = new ItemStack(Material.INK_SACK, 1, (short) 3); is = new ItemStack(Material.INK_SACK, 1, (short) 3);
} }
catch (NoSuchMethodError e) {
is = new ItemStack(Material.INK_SACK, 1, (short) 3);
}
} }
else if (mat == Material.CARROT) { else if (mat == Material.CARROT) {
is = new ItemStack(Material.CARROT_ITEM); is = new ItemStack(Material.CARROT_ITEM);
@ -423,11 +426,14 @@ public class Herbalism {
break; break;
case COCOA: case COCOA:
try { try {
hasSeeds = inventory.containsAtLeast(new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getDyeData()), 1); hasSeeds = inventory.containsAtLeast(new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getData()), 1);
} }
catch(Exception e) { catch(Exception e) {
hasSeeds = inventory.containsAtLeast(new ItemStack(Material.INK_SACK, 1, (short) 3), 1); hasSeeds = inventory.containsAtLeast(new ItemStack(Material.INK_SACK, 1, (short) 3), 1);
} }
catch(NoSuchMethodError e) {
hasSeeds = inventory.containsAtLeast(new ItemStack(Material.INK_SACK, 1, (short) 3), 1);
}
break; break;
case CARROT: case CARROT:
hasSeeds = inventory.contains(Material.CARROT_ITEM); hasSeeds = inventory.contains(Material.CARROT_ITEM);
@ -462,13 +468,17 @@ public class Herbalism {
break; break;
case COCOA: case COCOA:
try { try {
Misc.dropItems(location, new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getDyeData()), 3); Misc.dropItems(location, new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getData()), 3);
inventory.removeItem(new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getDyeData())); inventory.removeItem(new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getData()));
} }
catch(Exception e) { catch(Exception e) {
Misc.dropItems(location, new ItemStack(Material.INK_SACK, 1, (short) 3), 3); Misc.dropItems(location, new ItemStack(Material.INK_SACK, 1, (short) 3), 3);
inventory.removeItem(new ItemStack(Material.INK_SACK, 1, (short) 3)); inventory.removeItem(new ItemStack(Material.INK_SACK, 1, (short) 3));
} }
catch(NoSuchMethodError e) {
Misc.dropItems(location, new ItemStack(Material.INK_SACK, 1, (short) 3), 3);
inventory.removeItem(new ItemStack(Material.INK_SACK, 1, (short) 3));
}
break; break;
case CARROT: case CARROT:
Misc.dropItem(location, new ItemStack(Material.CARROT_ITEM)); Misc.dropItem(location, new ItemStack(Material.CARROT_ITEM));

5
src/main/java/com/gmail/nossr50/skills/mining/Mining.java
View File

@ -244,11 +244,14 @@ public class Mining {
case LAPIS_ORE: case LAPIS_ORE:
if (config.getLapisDoubleDropsEnabled()) { if (config.getLapisDoubleDropsEnabled()) {
try { try {
item = (new MaterialData(Material.INK_SACK, DyeColor.BLUE.getDyeData())).toItemStack(1); item = (new MaterialData(Material.INK_SACK, DyeColor.BLUE.getData())).toItemStack(1);
} }
catch(Exception e) { catch(Exception e) {
item = (new MaterialData(Material.INK_SACK, (byte) 4)).toItemStack(1); item = (new MaterialData(Material.INK_SACK, (byte) 4)).toItemStack(1);
} }
catch(NoSuchMethodError e) {
item = (new MaterialData(Material.INK_SACK, (byte) 4)).toItemStack(1);
}
Misc.dropItems(location, item, 4); Misc.dropItems(location, item, 4);
Misc.randomDropItems(location, item, 50, 4); Misc.randomDropItems(location, item, 50, 4);