Merge pull request #334 from Glitchfinder/fixes

More fixes.

pom.xml

@@ -121,16 +121,9 @@
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <version>LATEST</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.getspout</groupId>
-            <artifactId>spoutpluginapi</artifactId>
+            <artifactId>spoutplugin</artifactId>
             <version>dev-SNAPSHOT</version>
             <type>jar</type>
             <scope>compile</scope>

src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java

@@ -23,7 +23,7 @@ public class AxesCommand extends SkillCommand {
     private int bonusDamageAxesMaxBonusLevel = advancedConfig.getBonusDamageAxesMaxBonusLevel();
     private double critMaxChance = advancedConfig.getAxesCriticalChance();
     private int critMaxBonusLevel = advancedConfig.getAxesCriticalMaxBonusLevel();
-    private int greaterImpactIncreaseLevel = advancedConfig.getGreaterImpactIncreaseLevel();
+    private int greaterImpactIncreaseLevel = advancedConfig.getArmorImpactIncreaseLevel();
 //    private double greaterImpactModifier = advancedConfig.getGreaterImpactModifier();
     private int abilityLengthIncreaseLevel = advancedConfig.getAbilityLength();
 

src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.skills.gathering;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -17,8 +18,6 @@ import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.Wool;
 
-import org.bukkit.craftbukkit.entity.CraftSkeleton;
-
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.TreasuresConfig;
@@ -338,7 +337,28 @@ public class Fishing {
                 break;
 
             case SKELETON:
-                if (((CraftSkeleton) le).getHandle().getSkeletonType() == 1) {
+                Object o;
+                Class  c;
+                Method m;
+
+                o = le;
+                c = o.getClass();
+
+                boolean isWitherSkeleton = false;
+
+		try {
+                    m = c.getDeclaredMethod("getHandle");
+                    o = m.invoke(o);
+
+                    c = o.getClass();
+                    m = c.getDeclaredMethod("getSkeletonType");
+                    o = m.invoke(o);
+
+                    if(o instanceof Integer)
+                        isWitherSkeleton = (((Integer) o) == 1);
+                } catch(Exception e) {}
+
+                if (isWitherSkeleton) {
                     if (DROP_NUMBER > 95) {
                         Misc.dropItem(location, new ItemStack(Material.SKULL_ITEM, 1, (short) 1));
                     } else if (DROP_NUMBER > 50) {