Fixed Armor pen from Tactics not being in calculations. Remove color

codes when writing debug reports to file.
This commit is contained in:
sigonasr2 2017-01-18 08:45:14 -06:00
parent 45ec9bf301
commit fcaa8a49d0
3 changed files with 3 additions and 2 deletions

Binary file not shown.

View File

@ -2748,6 +2748,7 @@ public class CustomDamage {
if (ItemSet.HasSetBonusBasedOnSetBonusCount(GenericFunctions.getEquipment(p), p, ItemSet.LORASYS, 1)) { if (ItemSet.HasSetBonusBasedOnSetBonusCount(GenericFunctions.getEquipment(p), p, ItemSet.LORASYS, 1)) {
finaldmg += dmg*0.5; finaldmg += dmg*0.5;
} }
finaldmg += dmg*aPlugin.API.getPlayerBonuses(p).getBonusArmorPenetration();
} }
if (finaldmg>=dmg) { if (finaldmg>=dmg) {
return dmg; return dmg;

View File

@ -594,11 +594,11 @@ final class runServerHeartbeat implements Runnable {
aPlugin.API.takeTimings(3600); aPlugin.API.takeTimings(3600);
} }
TwosideKeeper.lastTimingReport=TwosideKeeper.getServerTickTime(); TwosideKeeper.lastTimingReport=TwosideKeeper.getServerTickTime();
GenericFunctions.logToFile("["+TwosideKeeper.getServerTickTime()+"] TPS: "+tps+"\n------------------\n"+TwosideKeeper.HeartbeatLogger.outputReport(),"logs/"+TwosideKeeper.getServerTickTime()); GenericFunctions.logToFile("["+TwosideKeeper.getServerTickTime()+"] TPS: "+tps+"\n------------------\n"+ChatColor.stripColor(TwosideKeeper.HeartbeatLogger.outputReport()),"logs/"+TwosideKeeper.getServerTickTime());
aPlugin.API.discordPostFileAttachment(new File(TwosideKeeper.filesave, "logs/"+TwosideKeeper.getServerTickTime())); aPlugin.API.discordPostFileAttachment(new File(TwosideKeeper.filesave, "logs/"+TwosideKeeper.getServerTickTime()));
} }
if (tps<18) { if (tps<18) {
GenericFunctions.logToFile("["+TwosideKeeper.getServerTickTime()+"] TPS: "+tps+"\n------------------\n"+TwosideKeeper.HeartbeatLogger.outputReport()); GenericFunctions.logToFile("["+TwosideKeeper.getServerTickTime()+"] TPS: "+tps+"\n------------------\n"+ChatColor.stripColor(TwosideKeeper.HeartbeatLogger.outputReport()));
} }
} }