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

Merge pull request #196 from bm01/master

Browse Source 
Added natural Iron Golems to exp table
This commit is contained in:
nossr50 2012-04-20 07:33:03 -07:00
commit 825bc87ca3
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/Combat.java
View File

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

3
src/main/java/com/gmail/nossr50/config/LoadProperties.java
View File

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

1
src/main/resources/config.yml
View File

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