From 1cfdfab2b77e87d03b0b237077b9f19b7a24e7a2 Mon Sep 17 00:00:00 2001 From: TheYeti Date: Wed, 25 Jan 2012 14:33:38 -0800 Subject: [PATCH] Fix typos and type cast mismatch from pull request #31 --- src/main/java/com/gmail/nossr50/skills/Fishing.java | 8 ++++---- src/main/java/com/gmail/nossr50/skills/Repair.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/skills/Fishing.java b/src/main/java/com/gmail/nossr50/skills/Fishing.java index b01bda280..9249e0617 100644 --- a/src/main/java/com/gmail/nossr50/skills/Fishing.java +++ b/src/main/java/com/gmail/nossr50/skills/Fishing.java @@ -4,7 +4,7 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.craftbukkit.entity.CraftItem; import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.* +import org.bukkit.entity.*; import org.bukkit.event.player.PlayerFishEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.material.Wool; @@ -703,7 +703,7 @@ public class Fishing { world.dropItemNaturally(le.getLocation(), new ItemStack(Material.LEATHER, 1)); } else{ - world.dropItemNaturally(le.getLocation(), new ItemStack(Material.RAW_BEEF, 1));) + world.dropItemNaturally(le.getLocation(), new ItemStack(Material.RAW_BEEF, 1)); } } @@ -737,7 +737,7 @@ public class Fishing { world.dropItemNaturally(le.getLocation(), new ItemStack(Material.LEATHER, 1)); } else{ - world.dropItemNaturally(le.getLocation(), new ItemStack(Material.RAW_BEEF, 1));) + world.dropItemNaturally(le.getLocation(), new ItemStack(Material.RAW_BEEF, 1)); } } else{ @@ -748,7 +748,7 @@ public class Fishing { else if(le instanceof Squid) { - world.dropItemNaturally(le.getLocation(), new ItemStack(Material.getMaterial(351), 1, (byte)0, (byte)0))); + world.dropItemNaturally(le.getLocation(), new ItemStack(Material.getMaterial(351), 1, (byte)0, (byte)0)); } else if(le instanceof Snowman){ diff --git a/src/main/java/com/gmail/nossr50/skills/Repair.java b/src/main/java/com/gmail/nossr50/skills/Repair.java index 78d82c18a..dde34abd7 100644 --- a/src/main/java/com/gmail/nossr50/skills/Repair.java +++ b/src/main/java/com/gmail/nossr50/skills/Repair.java @@ -422,7 +422,7 @@ public class Repair { } return false; } - public static short repairCalculate(Player player, short durability, short ramt){ + public static short repairCalculate(Player player, short durability, int ramt){ PlayerProfile PP = Users.getProfile(player); float bonus = (PP.getSkillLevel(SkillType.REPAIR) / 500); bonus = (ramt * bonus); @@ -438,7 +438,7 @@ public class Repair { } public static short getRepairAmount(ItemStack is, Player player){ short durability = is.getDurability(); - short ramt = 0; + int ramt = 0; switch(is.getTypeId()) { /*