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

No more spam with party damage messages.

Browse Source
This commit is contained in:
sigonasr2 2016-06-24 18:16:23 -05:00
parent cc2239c7ae
commit 93a9ca06fe
2 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

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

@ -394,11 +394,19 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
double old_armordef = pd.prev_armordef; double old_armordef = pd.prev_armordef;
double store1=CalculateDamageReduction(1,p,p),store2=CalculateWeaponDamage(p,null); double store1=CalculateDamageReduction(1,p,p),store2=CalculateWeaponDamage(p,null);
if (store1!=pd.damagereduction || store2!=pd.damagedealt) { if (store1!=pd.damagereduction || store2!=pd.damagedealt) {
log("Values: "+old_weapondmg+","
+old_buffdmg+","
+old_partydmg+","
+old_armordef+"::"+pd.prev_weapondmg+","
+pd.prev_buffdmg+","
+pd.prev_partydmg+","
+pd.prev_armordef,2);
pd.damagereduction = store1; pd.damagereduction = store1;
pd.damagedealt = store2; pd.damagedealt = store2;
DecimalFormat df = new DecimalFormat("0.0"); DecimalFormat df = new DecimalFormat("0.0");
if ((old_weapondmg != pd.prev_weapondmg && old_partydmg == pd.prev_partydmg && GenericFunctions.isWeapon(p.getEquipment().getItemInMainHand())) || if (((old_weapondmg != pd.prev_weapondmg && GenericFunctions.isWeapon(p.getEquipment().getItemInMainHand())) ||
(old_armordef != pd.prev_armordef && old_partydmg == pd.prev_partydmg && old_buffdmg == pd.prev_buffdmg)) { (old_armordef != pd.prev_armordef))
&& old_partydmg == pd.prev_partydmg && old_buffdmg == pd.prev_buffdmg) {
p.sendMessage(ChatColor.GRAY+""+ChatColor.ITALIC+"Base Damage: "+ChatColor.RESET+""+ChatColor.DARK_PURPLE+df.format(pd.damagedealt)+" "+ChatColor.GRAY+ChatColor.ITALIC+"Damage Reduction: "+ChatColor.RESET+""+ChatColor.DARK_AQUA+Math.round((1.0-pd.damagereduction)*100)+"%"); p.sendMessage(ChatColor.GRAY+""+ChatColor.ITALIC+"Base Damage: "+ChatColor.RESET+""+ChatColor.DARK_PURPLE+df.format(pd.damagedealt)+" "+ChatColor.GRAY+ChatColor.ITALIC+"Damage Reduction: "+ChatColor.RESET+""+ChatColor.DARK_AQUA+Math.round((1.0-pd.damagereduction)*100)+"%");
} }
} }
@ -2507,28 +2515,33 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
if (ev.getCause()==DamageCause.VOID) { if (ev.getCause()==DamageCause.VOID) {
Location p_loc = p.getLocation(); Location p_loc = p.getLocation();
p_loc.setY(0);
p.teleport(p_loc);
p.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION,20*18 /*Approx 18 sec to reach height 100*/,6));
p.addPotionEffect(new PotionEffect(PotionEffectType.LEVITATION,20*18 /*Approx 18 sec to reach height 100*/,6));
p.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE,20*26 /*Reduces fall damage temporarily.*/,500));
DecimalFormat df = new DecimalFormat("0.00");
double totalmoney = getPlayerMoney(p); double totalmoney = getPlayerMoney(p);
double rand_amt = 0.0; if (totalmoney>=0.01) {
if (totalmoney>5) { p_loc.setY(0);
rand_amt = Math.random()*5; p.teleport(p_loc);
p.addPotionEffect(new PotionEffect(PotionEffectType.SLOW,20*2 /*Approx 2 sec of no movement.*/,10));
p.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION,20*18 /*Approx 18 sec to reach height 100*/,6));
p.addPotionEffect(new PotionEffect(PotionEffectType.LEVITATION,20*18 /*Approx 18 sec to reach height 100*/,6));
p.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE,20*26 /*Reduces fall damage temporarily.*/,500));
DecimalFormat df = new DecimalFormat("0.00");
double rand_amt = 0.0;
if (totalmoney>5) {
rand_amt = Math.random()*5;
} else {
rand_amt = Math.random()*getPlayerMoney(p);
}
p.sendMessage("A Mysterious Entity forcefully removes "+ChatColor.YELLOW+"$"+df.format(rand_amt)+ChatColor.WHITE+" from your pockets.");
givePlayerMoney(p, -rand_amt);
Bukkit.getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
public void run() {
if (p!=null) {
p.sendMessage(ChatColor.AQUA+""+ChatColor.ITALIC+" \"Enjoy the ride!\"");
}
}}
,40);
} else { } else {
rand_amt = Math.random()*getPlayerMoney(p); p.sendMessage(ChatColor.RED+""+ChatColor.ITALIC+"A Mysterious Entity looks at your empty pockets with disdain, then laughs chaotically as you fall to your doom.");
} }
p.sendMessage("A Mysterious Entity forcefully removes "+ChatColor.YELLOW+"$"+df.format(rand_amt)+ChatColor.WHITE+" from your pockets.");
givePlayerMoney(p, -rand_amt);
Bukkit.getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
public void run() {
if (p!=null) {
p.sendMessage(ChatColor.AQUA+""+ChatColor.ITALIC+" \"Enjoy the ride!\"");
}
}}
,40);
} }
//See if we're in a party with a defender. //See if we're in a party with a defender.
@ -5045,8 +5058,8 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
partylevel = playerdata.get(j).partybonus; partylevel = playerdata.get(j).partybonus;
log("Party level is "+partylevel,5); log("Party level is "+partylevel,5);
if (partylevel>9) {partylevel=9;} if (partylevel>9) {partylevel=9;}
pd.prev_partydmg = partylevel;
} }
pd.prev_partydmg = partylevel;
} }
} }