Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-28 11:37:39 +01:00
Code Issues Projects Releases Wiki Activity

Adding Bats, Giants, Withers, and Wither Skeletons to the combat experience list.

Browse Source
This commit is contained in:
Glitchfinder 2012-12-30 12:33:38 -08:00
parent 7fc8d432b5
commit 28b092a4e3
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/config/Config.java
View File

@ -438,6 +438,10 @@ public class Config extends ConfigLoader {
public double getMagmaCubeXP() { return config.getDouble("Experience.Combat.Multiplier.Magma_Cube", 2.0); } public double getMagmaCubeXP() { return config.getDouble("Experience.Combat.Multiplier.Magma_Cube", 2.0); }
public double getEnderDragonXP() { return config.getDouble("Experience.Combat.Multiplier.Ender_Dragon", 8.0); } public double getEnderDragonXP() { return config.getDouble("Experience.Combat.Multiplier.Ender_Dragon", 8.0); }
public double getIronGolemXP() { return config.getDouble("Experience.Combat.Multiplier.Iron_Golem", 2.0); } public double getIronGolemXP() { return config.getDouble("Experience.Combat.Multiplier.Iron_Golem", 2.0); }
public double getGiantXP() { return config.getDouble("Experience.Combat.Multiplier.Giant", 2.0); }
public double getWitherXP() { return config.getDouble("Experience.Combat.Multiplier.Wither", 2.0); }
public double getWitherSkeletonXP() { return config.getDouble("Experience.Combat.Multiplier.Wither_Skeleton", 2.0); }
public double getWitchXP() { return config.getDouble("Experience.Combat.Multiplier.Witch", 2.0); }
/* XP Formula Multiplier */ /* XP Formula Multiplier */
public int getFormulaMultiplierCurve() { return config.getInt("Experience.Formula.Curve_Modifier", 20); } public int getFormulaMultiplierCurve() { return config.getInt("Experience.Formula.Curve_Modifier", 20); }

28
src/main/java/com/gmail/nossr50/util/Combat.java
View File

@ -10,6 +10,7 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.IronGolem; 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.Skeleton;
import org.bukkit.entity.Tameable; import org.bukkit.entity.Tameable;
import org.bukkit.entity.Wolf; import org.bukkit.entity.Wolf;
import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent;
@ -406,6 +407,10 @@ public class Combat {
EntityType type = target.getType(); EntityType type = target.getType();
switch (type) { switch (type) {
case BAT:
baseXP = configInstance.getAnimalsXP();
break;
case BLAZE: case BLAZE:
baseXP = configInstance.getBlazeXP(); baseXP = configInstance.getBlazeXP();
break; break;
@ -430,6 +435,10 @@ public class Combat {
baseXP = configInstance.getGhastXP(); baseXP = configInstance.getGhastXP();
break; break;
case GIANT:
baseXP = configInstance.getGiantXP();
break;
case MAGMA_CUBE: case MAGMA_CUBE:
baseXP = configInstance.getMagmaCubeXP(); baseXP = configInstance.getMagmaCubeXP();
break; break;
@ -450,9 +459,14 @@ public class Combat {
break; break;
case SKELETON: case SKELETON:
baseXP = configInstance.getSkeletonXP(); switch(((Skeleton) target).getSkeletonType()) {
break; case WITHER:
baseXP = configInstance.getWitherSkeletonXP();
break;
default:
baseXP = configInstance.getSkeletonXP();
break;
}
case SLIME: case SLIME:
baseXP = configInstance.getSlimeXP(); baseXP = configInstance.getSlimeXP();
break; break;
@ -461,6 +475,14 @@ public class Combat {
baseXP = configInstance.getSpiderXP(); baseXP = configInstance.getSpiderXP();
break; break;
case WITCH:
baseXP = configInstance.getWitchXP();
break;
case WITHER:
baseXP = configInstance.getWitherXP();
break;
case ZOMBIE: case ZOMBIE:
baseXP = configInstance.getZombieXP(); baseXP = configInstance.getZombieXP();
break; break;

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

@ -323,6 +323,10 @@ Experience:
Slime: 2.0 Slime: 2.0
Ghast: 3.0 Ghast: 3.0
Iron_Golem: 2.0 Iron_Golem: 2.0
Giant: 4.0
Wither: 7.0
Wither_Skeleton: 4.0
Witch: 4.0
# #
# Settings for commands # Settings for commands
### ###