Merge pull request #196 from bm01/master

Added natural Iron Golems to exp table

src/main/java/com/gmail/nossr50/Combat.java

@@ -7,6 +7,7 @@ import org.bukkit.entity.Animals;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.IronGolem;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Wolf;
@@ -441,6 +442,11 @@ public class Combat {
                     baseXP = LoadProperties.magmacubeXP;
                     break;
 
+                case IRON_GOLEM:
+                    if (!((IronGolem) target).isPlayerCreated())
+                        baseXP = LoadProperties.irongolemXP;
+                    break;
+
                 case PIG_ZOMBIE:
                     baseXP = LoadProperties.pigzombieXP;
                     break;

src/main/java/com/gmail/nossr50/config/LoadProperties.java

@@ -120,7 +120,7 @@ public class LoadProperties extends ConfigLoader{
     public static double pvpxprewardmodifier;
     public static double animalXP, creeperXP, skeletonXP, spiderXP, ghastXP, slimeXP,
                          zombieXP, pigzombieXP, endermanXP, cavespiderXP, silverfishXP,
-                         blazeXP, magmacubeXP, enderdragonXP;
+                         blazeXP, magmacubeXP, enderdragonXP, irongolemXP;
 
     /* XP Formula Multiplier */
     public static double tamingxpmodifier, miningxpmodifier, repairxpmodifier, woodcuttingxpmodifier,
@@ -475,6 +475,7 @@ public class LoadProperties extends ConfigLoader{
         blazeXP = config.getDouble("Experience.Combat.Multiplier.Blaze", 3.0);
         magmacubeXP = config.getDouble("Experience.Combat.Multiplier.Magma_Cube", 2.0);
         enderdragonXP = config.getDouble("Experience.Combat.Multiplier.Ender_Dragon", 8.0);
+        irongolemXP = config.getDouble("Experience.Combat.Multiplier.Iron_Golem", 2.0);
 
         detonatorID = config.getInt("Skills.Mining.Detonator_ID", 259);
     }

src/main/resources/config.yml

@@ -271,6 +271,7 @@ Experience:
             Ender_Dragon: 8.0
             Slime: 2.0
             Ghast: 3.0
+            Iron_Golem: 2.0
 #
 #  Settings for commands
 ###