Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: data/scripts/handlers/skillhandlers/Pdam.java
- ===================================================================
- --- data/scripts/handlers/skillhandlers/Pdam.java (revision 5910)
- +++ data/scripts/handlers/skillhandlers/Pdam.java (working copy)
- @@ -139,52 +139,52 @@
- if (!skillIsEvaded)
- {
- - if (damage > 0)
- + if (skill.hasEffects())
- {
- - activeChar.sendDamageMessage(target, damage, false, crit, false);
- -
- - if (skill.hasEffects())
- + if ((reflect & Formulas.SKILL_REFLECT_SUCCEED) != 0)
- {
- - if ((reflect & Formulas.SKILL_REFLECT_SUCCEED) != 0)
- + activeChar.stopSkillEffects(skill.getId());
- + skill.getEffects(target, activeChar);
- + SystemMessage sm = new SystemMessage(SystemMessageId.YOU_FEEL_S1_EFFECT);
- + sm.addSkillName(skill);
- + activeChar.sendPacket(sm);
- + }
- + else
- + {
- + // activate attacked effects, if any
- + target.stopSkillEffects(skill.getId());
- + if (Formulas.calcSkillSuccess(activeChar, target, skill, shld, false, false, true))
- {
- - activeChar.stopSkillEffects(skill.getId());
- - skill.getEffects(target, activeChar);
- + skill.getEffects(activeChar, target, new Env(shld, false, false, false));
- +
- SystemMessage sm = new SystemMessage(SystemMessageId.YOU_FEEL_S1_EFFECT);
- sm.addSkillName(skill);
- - activeChar.sendPacket(sm);
- + target.sendPacket(sm);
- }
- else
- {
- - // activate attacked effects, if any
- - target.stopSkillEffects(skill.getId());
- - if (Formulas.calcSkillSuccess(activeChar, target, skill, shld, false, false, true))
- - {
- - skill.getEffects(activeChar, target, new Env(shld, false, false, false));
- -
- - SystemMessage sm = new SystemMessage(SystemMessageId.YOU_FEEL_S1_EFFECT);
- - sm.addSkillName(skill);
- - target.sendPacket(sm);
- - }
- - else
- - {
- - SystemMessage sm = new SystemMessage(SystemMessageId.C1_RESISTED_YOUR_S2);
- - sm.addCharName(target);
- - sm.addSkillName(skill);
- - activeChar.sendPacket(sm);
- - }
- + SystemMessage sm = new SystemMessage(SystemMessageId.C1_RESISTED_YOUR_S2);
- + sm.addCharName(target);
- + sm.addSkillName(skill);
- + activeChar.sendPacket(sm);
- }
- -
- - if (Config.LOG_GAME_DAMAGE
- - && activeChar instanceof L2Playable
- - && damage > Config.LOG_GAME_DAMAGE_THRESHOLD)
- - {
- - LogRecord record = new LogRecord(Level.INFO, "");
- - record.setParameters(new Object[]{activeChar, " did damage ", damage, skill, " to ", target});
- - record.setLoggerName("pdam");
- - _logDamage.log(record);
- - }
- }
- + if (Config.LOG_GAME_DAMAGE
- + && activeChar instanceof L2Playable
- + && damage > Config.LOG_GAME_DAMAGE_THRESHOLD)
- + {
- + LogRecord record = new LogRecord(Level.INFO, "");
- + record.setParameters(new Object[]{activeChar, " did damage ", damage, skill, " to ", target});
- + record.setLoggerName("pdam");
- + _logDamage.log(record);
- + }
- + }
- +
- + if (damage > 0)
- + {
- + activeChar.sendDamageMessage(target, damage, false, crit, false);
- +
- // Possibility of a lethal strike
- final boolean lethal = Formulas.calcLethalHit(activeChar, target, skill);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement