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

Merge pull request #495 from Glitchfinder/master

Browse Source 
Converting the calls back to getDyeData().
This commit is contained in:
Glitchfinder 2013-01-13 18:29:37 -08:00
commit c2738d247a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -266,7 +266,7 @@ public class Herbalism {
else {
if (mat == Material.COCOA) {
try {
is = new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getData());
is = new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getDyeData());
}
catch (Exception e) {
is = new ItemStack(Material.INK_SACK, 1, (short) 3);
@ -426,7 +426,7 @@ public class Herbalism {
break;
case COCOA:
try {
hasSeeds = inventory.containsAtLeast(new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getData()), 1);
hasSeeds = inventory.containsAtLeast(new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getDyeData()), 1);
}
catch(Exception e) {
hasSeeds = inventory.containsAtLeast(new ItemStack(Material.INK_SACK, 1, (short) 3), 1);
@ -468,8 +468,8 @@ public class Herbalism {
break;
case COCOA:
try {
Misc.dropItems(location, new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getData()), 3);
inventory.removeItem(new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getData()));
Misc.dropItems(location, new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getDyeData()), 3);
inventory.removeItem(new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getDyeData()));
}
catch(Exception e) {
Misc.dropItems(location, new ItemStack(Material.INK_SACK, 1, (short) 3), 3);

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

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