Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-27 02:58:03 +01:00
Code Issues Projects Releases Wiki Activity

Fixing merge issues, again.

Browse Source
This commit is contained in:
gmcferrin 2013-01-08 18:52:50 -05:00
parent 0249ae2724
commit 793bd04afe
3 changed files with 10 additions and 9 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

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

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

@ -277,10 +277,10 @@ public class Herbalism {
}
}
else if (mat == Material.CARROT) {
is = new ItemStack(Material.CARROT_ITEM, 1, (short) 0);
is = new ItemStack(Material.CARROT_ITEM);
}
else if (mat == Material.POTATO) {
is = new ItemStack(Material.POTATO_ITEM, 1, (short) 0);
is = new ItemStack(Material.POTATO_ITEM);
}
else {
is = new ItemStack(mat);
@ -467,11 +467,11 @@ public class Herbalism {
break;
case COCOA:
try {
Misc.dropItem(location, new ItemStack(Material.INK_SACK, 3, DyeColor.BROWN.getDyeData()));
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.dropItem(location, new ItemStack(Material.INK_SACK, 3, (short) 3));
Misc.dropItems(location, new ItemStack(Material.INK_SACK, 1, (short) 3), 3);
inventory.removeItem(new ItemStack(Material.INK_SACK, 1, (short) 3));
}
break;
@ -487,7 +487,7 @@ public class Herbalism {
inventory.removeItem(new ItemStack(Material.POTATO_ITEM));
break;
case NETHER_WARTS:
Misc.dropItem(location, new ItemStack(Material.NETHER_STALK, 2));
Misc.dropItems(location, new ItemStack(Material.NETHER_STALK), 2);
Misc.randomDropItems(location, new ItemStack(Material.NETHER_STALK), 50, 2);
inventory.removeItem(new ItemStack(Material.NETHER_STALK));
break;
@ -508,8 +508,8 @@ public class Herbalism {
* @param block The block being used in the ability
*/
public static void greenThumbBlocks(ItemStack is, Player player, Block block) {
final int MAX_CHANCE = advancedConfig.getGreenThumbChanceMax();
final int MAX_BONUS_LEVEL = advancedConfig.getGreenThumbMaxLevel();
final int MAX_CHANCE = advancedConfig.getGreenThumbChanceMax();
final int MAX_BONUS_LEVEL = advancedConfig.getGreenThumbMaxLevel();
PlayerProfile profile = Users.getProfile(player);
int skillLevel = profile.getSkillLevel(SkillType.HERBALISM);

3
src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairManager.java
View File

@ -5,6 +5,7 @@ import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
@ -165,7 +166,7 @@ public class SimpleRepairManager implements RepairManager {
item.setAmount(item.getAmount() - 1);
}
else {
item = new ItemStack(0);
item = new ItemStack(Material.AIR);
}
// I suspect this may not be needed, but I don't think it hurts