sigonasr2/TwosideKeeper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Creeper Explosion Damage.

Browse Source
This commit is contained in:
sigonasr2 2016-07-26 06:01:02 -05:00
parent 5304bd665b
commit 42dc5a29a4
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

2
src/plugin.yml
View File

@ -1,6 +1,6 @@
name: TwosideKeeper name: TwosideKeeper
main: sig.plugin.TwosideKeeper.TwosideKeeper main: sig.plugin.TwosideKeeper.TwosideKeeper
version: 3.7.0a version: 3.7.0ar1
commands: commands:
money: money:
description: Tells the player the amount of money they are holding. description: Tells the player the amount of money they are holding.

10
src/sig/plugin/TwosideKeeper/NewCombat.java
View File

@ -106,7 +106,7 @@ public class NewCombat {
LivingEntity shooter = getDamagerEntity(damager); LivingEntity shooter = getDamagerEntity(damager);
if (shooter!=null) { if (shooter!=null) {
totaldmg += calculateMobBaseDamage((LivingEntity)shooter); totaldmg += calculateMobBaseDamage((LivingEntity)shooter, target);
totaldmg += CalculateWeaponDamage(shooter, target); totaldmg += CalculateWeaponDamage(shooter, target);
bonusmult *= calculateMonsterDifficultyMultiplier(shooter); bonusmult *= calculateMonsterDifficultyMultiplier(shooter);
} else { } else {
@ -152,7 +152,7 @@ public class NewCombat {
armorpendmg; armorpendmg;
} }
static double calculateMobBaseDamage(LivingEntity damager) { static double calculateMobBaseDamage(LivingEntity damager, LivingEntity target) {
double dmg = 0.0; double dmg = 0.0;
Difficulty diff = damager.getWorld().getDifficulty(); Difficulty diff = damager.getWorld().getDifficulty();
double[] difficulty_damage = {0.0,0.0,0.0}; //Damager per difficulty. {EASY,MEDIUM,HARD} double[] difficulty_damage = {0.0,0.0,0.0}; //Damager per difficulty. {EASY,MEDIUM,HARD}
@ -167,9 +167,11 @@ public class NewCombat {
case LIGHTNING: case LIGHTNING:
if (damager instanceof Creeper) { if (damager instanceof Creeper) {
Creeper c = (Creeper)damager; Creeper c = (Creeper)damager;
difficulty_damage = (c.isPowered())?new double[]{48.0,72.0,98.0}:new double[]{24.0,36.0,49.0}; double damage_mult = 2.0d/c.getLocation().distance(target.getLocation());
damage_mult*=TwosideKeeper.EXPLOSION_DMG_MULT;
difficulty_damage = (c.isPowered())?new double[]{48.0*damage_mult,72.0*damage_mult,98.0*damage_mult}:new double[]{24.0*damage_mult,36.0*damage_mult,49.0*damage_mult};
} else { } else {
difficulty_damage=new double[]{24.0,36.0,49.0}; difficulty_damage=new double[]{12.0,18.0,24.0};
} }
break; break;
case DRAGON_FIREBALL: case DRAGON_FIREBALL:

2
src/sig/plugin/TwosideKeeper/TwosideKeeper.java
View File

@ -3581,7 +3581,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
} }
ev.setDamage(NewCombat.CalculateDamageReduction(ev.getDamage()*EXPLOSION_DMG_MULT*((100-protectionlevel)*0.01),p,null)); ev.setDamage(NewCombat.CalculateDamageReduction(ev.getDamage()*EXPLOSION_DMG_MULT*((100-protectionlevel)*0.01),p,null));
log("Damage is "+ev.getDamage(),4); log("Explosion Damage is "+ev.getDamage(),2);
//ev.setDamage(CalculateDamageReduction(ev.getDamage()*EXPLOSION_DMG_MULT,p,null)); //ev.setDamage(CalculateDamageReduction(ev.getDamage()*EXPLOSION_DMG_MULT,p,null));
} }