EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 03:34:43 +02:00
Code Issues Projects Releases Wiki Activity

Some cleanups to mob related XP code

Browse Source
This commit is contained in:
t00thpick1
2017-04-15 00:04:07 -04:00
parent c9c2c483fa
commit a43ae4178a
5 changed files with 23 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -477,56 +477,22 @@ public final class CombatUtils {
else if (target instanceof Monster)
{
EntityType type = target.getType();
baseXP = ExperienceConfig.getInstance().getCombatXP(type);
if (type == EntityType.IRON_GOLEM)
{
if (!((IronGolem) target).isPlayerCreated()) {
baseXP = ExperienceConfig.getInstance().getCombatXP(type);
}
}
else
{
baseXP = ExperienceConfig.getInstance().getCombatXP(type);
}
}
else {
EntityType type = target.getType();
switch (type) {
case BAT:
case SQUID:
case RABBIT:
baseXP = ExperienceConfig.getInstance().getAnimalsXP(type);
break;
case BLAZE:
case CAVE_SPIDER:
case CREEPER:
case ENDER_DRAGON:
case ENDERMAN:
case ENDERMITE:
case GHAST:
case GIANT:
case MAGMA_CUBE:
case PIG_ZOMBIE:
case SHULKER:
case SILVERFISH:
case SLIME:
case SPIDER:
case WITCH:
case WITHER:
case ZOMBIE_VILLAGER:
case ZOMBIE:
case GUARDIAN:
case ELDER_GUARDIAN:
case HUSK:
case STRAY:
case WITHER_SKELETON:
baseXP = ExperienceConfig.getInstance().getCombatXP(type);
break;
case IRON_GOLEM:
if (!((IronGolem) target).isPlayerCreated()) {
baseXP = ExperienceConfig.getInstance().getCombatXP(type);
}
break;
default:
baseXP = 1.0;
mcMMO.getModManager().addCustomEntity(target);
break;
}
baseXP = 1.0;
mcMMO.getModManager().addCustomEntity(target);
}
if (target.hasMetadata(mcMMO.entityMetadataKey)) {