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

Updates to Combat - Breaks R4 Compatability.

Browse Source
This commit is contained in:
GJ 2012-02-26 14:38:03 -05:00
parent 4b26732f51
commit dd445dbac5
1 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -381,38 +381,54 @@ public class Combat
else else
xpinc = damage; xpinc = damage;
if(entity instanceof Animals) if(entity instanceof Animals)
xp = (int) (xpinc * LoadProperties.animalXP); xp = (int) (xpinc * LoadProperties.animalXP);
else else
{ {
if(entity instanceof Enderman) EntityType type = entity.getType();
xp = (int) (xpinc * LoadProperties.endermanXP); switch(type){
else if(entity instanceof Creeper) case BLAZE:
xp = (int) (xpinc * LoadProperties.creeperXP); xp = (int) (xpinc * LoadProperties.blazeXP);
else if(entity instanceof Silverfish) break;
xp = (int) (xpinc * LoadProperties.silverfishXP); case CAVE_SPIDER:
else if(entity instanceof CaveSpider) xp = (int) (xpinc * LoadProperties.cavespiderXP);
xp = (int) (xpinc * LoadProperties.cavespiderXP); break;
else if(entity instanceof Spider) case CREEPER:
xp = (int) (xpinc * LoadProperties.spiderXP); xp = (int) (xpinc * LoadProperties.creeperXP);
else if(entity instanceof Skeleton) break;
xp = (int) (xpinc * LoadProperties.skeletonXP); case ENDER_DRAGON:
else if(entity instanceof Zombie) xp = (int) (xpinc * LoadProperties.enderdragonXP);
xp = (int) (xpinc * LoadProperties.zombieXP); break;
else if(entity instanceof PigZombie) case ENDERMAN:
xp = (int) (xpinc * LoadProperties.pigzombieXP); xp = (int) (xpinc * LoadProperties.endermanXP);
else if(entity instanceof Slime) break;
xp = (int) (xpinc * LoadProperties.slimeXP); case GHAST:
else if(entity instanceof Ghast) xp = (int) (xpinc * LoadProperties.ghastXP);
xp = (int) (xpinc * LoadProperties.ghastXP); break;
else if(entity instanceof Blaze) case MAGMA_CUBE:
xp = (int) (xpinc * LoadProperties.blazeXP); xp = (int) (xpinc * LoadProperties.magmacubeXP);
else if(entity instanceof EnderDragon) break;
xp = (int) (xpinc * LoadProperties.enderdragonXP); case PIG_ZOMBIE:
else if(entity instanceof MagmaCube) xp = (int) (xpinc * LoadProperties.pigzombieXP);
xp = (int) (xpinc * LoadProperties.magmacubeXP); break;
} case SILVERFISH:
} xp = (int) (xpinc * LoadProperties.silverfishXP);
return xp; break;
case SKELETON:
xp = (int) (xpinc * LoadProperties.skeletonXP);
break;
case SLIME:
xp = (int) (xpinc * LoadProperties.slimeXP);
break;
case SPIDER:
xp = (int) (xpinc * LoadProperties.spiderXP);
break;
case ZOMBIE:
xp = (int) (xpinc * LoadProperties.zombieXP);
break;
}
}
}
return xp;
} }
} }