lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed on screen damage text not showing.

Browse Source
This commit is contained in:
MobiusDev
2017-12-07 01:30:48 +00:00
parent d5c7a92b95
commit a3d34fc282
15 changed files with 125 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -4532,8 +4532,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
} }
public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
{
// Notify of this attack only if there is an attacking creature.
if (attacker != null)
{ {
EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker); EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
}
final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class); final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
if (term != null) if (term != null)
{ {
@@ -4555,6 +4560,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
} }
if (attacker != null)
{
attacker.sendDamageMessage(this, skill, (int) value, critical, false);
}
} }
public void reduceCurrentMp(double i) public void reduceCurrentMp(double i)

7
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
View File

@@ -121,6 +121,13 @@ public class DoppelgangerInstance extends L2Npc
return (getSummoner() != null) ? getSummoner().isAutoAttackable(attacker) : super.isAutoAttackable(attacker); return (getSummoner() != null) ? getSummoner().isAutoAttackable(attacker) : super.isAutoAttackable(attacker);
} }
@Override
public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
{
super.doAttack(damage, target, skill, isDOT, directlyToHp, critical, reflect);
sendDamageMessage(target, skill, (int) damage, critical, false);
}
@Override @Override
public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss)
{ {

7
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java
View File

@@ -245,6 +245,13 @@ public final class L2TrapInstance extends L2Npc
_playersWhoDetectedMe.clear(); _playersWhoDetectedMe.clear();
} }
@Override
public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
{
super.doAttack(damage, target, skill, isDOT, directlyToHp, critical, reflect);
sendDamageMessage(target, skill, (int) damage, critical, false);
}
@Override @Override
public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss)
{ {

10
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -4532,8 +4532,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
} }
public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
{
// Notify of this attack only if there is an attacking creature.
if (attacker != null)
{ {
EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker); EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
}
final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class); final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
if (term != null) if (term != null)
{ {
@@ -4555,6 +4560,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
} }
if (attacker != null)
{
attacker.sendDamageMessage(this, skill, (int) value, critical, false);
}
} }
public void reduceCurrentMp(double i) public void reduceCurrentMp(double i)

7
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
View File

@@ -121,6 +121,13 @@ public class DoppelgangerInstance extends L2Npc
return (getSummoner() != null) ? getSummoner().isAutoAttackable(attacker) : super.isAutoAttackable(attacker); return (getSummoner() != null) ? getSummoner().isAutoAttackable(attacker) : super.isAutoAttackable(attacker);
} }
@Override
public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
{
super.doAttack(damage, target, skill, isDOT, directlyToHp, critical, reflect);
sendDamageMessage(target, skill, (int) damage, critical, false);
}
@Override @Override
public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss)
{ {

7
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java
View File

@@ -245,6 +245,13 @@ public final class L2TrapInstance extends L2Npc
_playersWhoDetectedMe.clear(); _playersWhoDetectedMe.clear();
} }
@Override
public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
{
super.doAttack(damage, target, skill, isDOT, directlyToHp, critical, reflect);
sendDamageMessage(target, skill, (int) damage, critical, false);
}
@Override @Override
public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss)
{ {

10
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -4532,8 +4532,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
} }
public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
{
// Notify of this attack only if there is an attacking creature.
if (attacker != null)
{ {
EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker); EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
}
final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class); final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
if (term != null) if (term != null)
{ {
@@ -4555,6 +4560,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
} }
if (attacker != null)
{
attacker.sendDamageMessage(this, skill, (int) value, critical, false);
}
} }
public void reduceCurrentMp(double i) public void reduceCurrentMp(double i)

7
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
View File

@@ -121,6 +121,13 @@ public class DoppelgangerInstance extends L2Npc
return (getSummoner() != null) ? getSummoner().isAutoAttackable(attacker) : super.isAutoAttackable(attacker); return (getSummoner() != null) ? getSummoner().isAutoAttackable(attacker) : super.isAutoAttackable(attacker);
} }
@Override
public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
{
super.doAttack(damage, target, skill, isDOT, directlyToHp, critical, reflect);
sendDamageMessage(target, skill, (int) damage, critical, false);
}
@Override @Override
public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss)
{ {

7
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java
View File

@@ -245,6 +245,13 @@ public final class L2TrapInstance extends L2Npc
_playersWhoDetectedMe.clear(); _playersWhoDetectedMe.clear();
} }
@Override
public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
{
super.doAttack(damage, target, skill, isDOT, directlyToHp, critical, reflect);
sendDamageMessage(target, skill, (int) damage, critical, false);
}
@Override @Override
public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss)
{ {

10
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -4532,8 +4532,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
} }
public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
{
// Notify of this attack only if there is an attacking creature.
if (attacker != null)
{ {
EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker); EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
}
final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class); final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
if (term != null) if (term != null)
{ {
@@ -4555,6 +4560,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
} }
if (attacker != null)
{
attacker.sendDamageMessage(this, skill, (int) value, critical, false);
}
} }
public void reduceCurrentMp(double i) public void reduceCurrentMp(double i)

7
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
View File

@@ -121,6 +121,13 @@ public class DoppelgangerInstance extends L2Npc
return (getSummoner() != null) ? getSummoner().isAutoAttackable(attacker) : super.isAutoAttackable(attacker); return (getSummoner() != null) ? getSummoner().isAutoAttackable(attacker) : super.isAutoAttackable(attacker);
} }
@Override
public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
{
super.doAttack(damage, target, skill, isDOT, directlyToHp, critical, reflect);
sendDamageMessage(target, skill, (int) damage, critical, false);
}
@Override @Override
public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss)
{ {

7
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java
View File

@@ -245,6 +245,13 @@ public final class L2TrapInstance extends L2Npc
_playersWhoDetectedMe.clear(); _playersWhoDetectedMe.clear();
} }
@Override
public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
{
super.doAttack(damage, target, skill, isDOT, directlyToHp, critical, reflect);
sendDamageMessage(target, skill, (int) damage, critical, false);
}
@Override @Override
public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss)
{ {

10
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -4532,8 +4532,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
} }
public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect) public void reduceCurrentHp(double value, L2Character attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
{
// Notify of this attack only if there is an attacking creature.
if (attacker != null)
{ {
EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker); EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
}
final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class); final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
if (term != null) if (term != null)
{ {
@@ -4555,6 +4560,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{ {
getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
} }
if (attacker != null)
{
attacker.sendDamageMessage(this, skill, (int) value, critical, false);
}
} }
public void reduceCurrentMp(double i) public void reduceCurrentMp(double i)

7
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/DoppelgangerInstance.java
View File

@@ -121,6 +121,13 @@ public class DoppelgangerInstance extends L2Npc
return (getSummoner() != null) ? getSummoner().isAutoAttackable(attacker) : super.isAutoAttackable(attacker); return (getSummoner() != null) ? getSummoner().isAutoAttackable(attacker) : super.isAutoAttackable(attacker);
} }
@Override
public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
{
super.doAttack(damage, target, skill, isDOT, directlyToHp, critical, reflect);
sendDamageMessage(target, skill, (int) damage, critical, false);
}
@Override @Override
public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss)
{ {

7
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java
View File

@@ -245,6 +245,13 @@ public final class L2TrapInstance extends L2Npc
_playersWhoDetectedMe.clear(); _playersWhoDetectedMe.clear();
} }
@Override
public void doAttack(double damage, L2Character target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
{
super.doAttack(damage, target, skill, isDOT, directlyToHp, critical, reflect);
sendDamageMessage(target, skill, (int) damage, critical, false);
}
@Override @Override
public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss) public void sendDamageMessage(L2Character target, Skill skill, int damage, boolean crit, boolean miss)
{ {