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

Prohibit entering combat with self damage skills.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-08-29 21:06:19 +00:00
parent a5219616ff
commit 2e51962345
32 changed files with 122 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
{
return skill.isToggle();
}
damage = effected.getCurrentHp() - 1;
}
}
effector.doAttack(damage, effected, skill, true, false, false, false);
return skill.isToggle();
}
}

6
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Flag the attacker if it's a PlayerInstance outside a PvP area
final PlayerInstance player = getActingPlayer();
if (player != null)
if ((player != null) && (player != target))
{
AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
player.updatePvPStatus(target);
@ -4397,13 +4397,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Start attack stance and notify being attacked.
if ((this != target))
{
if (target.hasAI())
{
target.getAI().clientStartAutoAttack();
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
}
getAI().clientStartAutoAttack();
}
// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
double damage = damageValue;

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
{
return skill.isToggle();
}
damage = effected.getCurrentHp() - 1;
}
}
effector.doAttack(damage, effected, skill, true, false, false, false);
return skill.isToggle();
}
}

6
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Flag the attacker if it's a PlayerInstance outside a PvP area
final PlayerInstance player = getActingPlayer();
if (player != null)
if ((player != null) && (player != target))
{
AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
player.updatePvPStatus(target);
@ -4397,13 +4397,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Start attack stance and notify being attacked.
if ((this != target))
{
if (target.hasAI())
{
target.getAI().clientStartAutoAttack();
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
}
getAI().clientStartAutoAttack();
}
// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
double damage = damageValue;

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
{
return skill.isToggle();
}
damage = effected.getCurrentHp() - 1;
}
}
effector.doAttack(damage, effected, skill, true, false, false, false);
return skill.isToggle();
}
}

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Flag the attacker if it's a PlayerInstance outside a PvP area
final PlayerInstance player = getActingPlayer();
if (player != null)
if ((player != null) && (player != target))
{
AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
player.updatePvPStatus(target);
@ -4397,13 +4397,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Start attack stance and notify being attacked.
if ((this != target))
{
if (target.hasAI())
{
target.getAI().clientStartAutoAttack();
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
}
getAI().clientStartAutoAttack();
}
// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
double damage = damageValue;

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
{
return skill.isToggle();
}
damage = effected.getCurrentHp() - 1;
}
}
effector.doAttack(damage, effected, skill, true, false, false, false);
return skill.isToggle();
}
}

6
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Flag the attacker if it's a PlayerInstance outside a PvP area
final PlayerInstance player = getActingPlayer();
if (player != null)
if ((player != null) && (player != target))
{
AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
player.updatePvPStatus(target);
@ -4397,13 +4397,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Start attack stance and notify being attacked.
if ((this != target))
{
if (target.hasAI())
{
target.getAI().clientStartAutoAttack();
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
}
getAI().clientStartAutoAttack();
}
// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
double damage = damageValue;

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
{
return skill.isToggle();
}
damage = effected.getCurrentHp() - 1;
}
}
effector.doAttack(damage, effected, skill, true, false, false, false);
return skill.isToggle();
}
}

6
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Flag the attacker if it's a PlayerInstance outside a PvP area
final PlayerInstance player = getActingPlayer();
if (player != null)
if ((player != null) && (player != target))
{
AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
player.updatePvPStatus(target);
@ -4397,13 +4397,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Start attack stance and notify being attacked.
if ((this != target))
{
if (target.hasAI())
{
target.getAI().clientStartAutoAttack();
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
}
getAI().clientStartAutoAttack();
}
// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
double damage = damageValue;

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
{
return skill.isToggle();
}
damage = effected.getCurrentHp() - 1;
}
}
effector.doAttack(damage, effected, skill, true, false, false, false);
return skill.isToggle();
}
}

6
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Flag the attacker if it's a PlayerInstance outside a PvP area
final PlayerInstance player = getActingPlayer();
if (player != null)
if ((player != null) && (player != target))
{
AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
player.updatePvPStatus(target);
@ -4397,13 +4397,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Start attack stance and notify being attacked.
if ((this != target))
{
if (target.hasAI())
{
target.getAI().clientStartAutoAttack();
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
}
getAI().clientStartAutoAttack();
}
// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
double damage = damageValue;

2
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
{
return skill.isToggle();
}
damage = effected.getCurrentHp() - 1;
}
}
effector.doAttack(damage, effected, skill, true, false, false, false);
return skill.isToggle();
}
}

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Flag the attacker if it's a PlayerInstance outside a PvP area
final PlayerInstance player = getActingPlayer();
if (player != null)
if ((player != null) && (player != target))
{
AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
player.updatePvPStatus(target);
@ -4397,13 +4397,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Start attack stance and notify being attacked.
if ((this != target))
{
if (target.hasAI())
{
target.getAI().clientStartAutoAttack();
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
}
getAI().clientStartAutoAttack();
}
// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
double damage = damageValue;

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
{
return skill.isToggle();
}
damage = effected.getCurrentHp() - 1;
}
}
effector.doAttack(damage, effected, skill, true, false, false, false);
return skill.isToggle();
}
}

6
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Flag the attacker if it's a PlayerInstance outside a PvP area
final PlayerInstance player = getActingPlayer();
if (player != null)
if ((player != null) && (player != target))
{
AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
player.updatePvPStatus(target);
@ -4396,13 +4396,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Start attack stance and notify being attacked.
if ((this != target))
{
if (target.hasAI())
{
target.getAI().clientStartAutoAttack();
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
}
getAI().clientStartAutoAttack();
}
// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
double damage = damageValue;

2
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,10 +71,10 @@ public class DamOverTimePercent extends AbstractEffect
{
return info.getSkill().isToggle();
}
damage = info.getEffected().getCurrentHp() - 1;
}
}
info.getEffected().reduceCurrentHpByDOT(damage, info.getEffector(), info.getSkill());
info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, true);
return info.getSkill().isToggle();

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,10 +71,10 @@ public class DamOverTimePercent extends AbstractEffect
{
return info.getSkill().isToggle();
}
damage = info.getEffected().getCurrentHp() - 1;
}
}
info.getEffected().reduceCurrentHpByDOT(damage, info.getEffector(), info.getSkill());
info.getEffected().notifyDamageReceived(damage, info.getEffector(), info.getSkill(), false, true);
return info.getSkill().isToggle();

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
{
return skill.isToggle();
}
damage = effected.getCurrentHp() - 1;
}
}
effector.doAttack(damage, effected, skill, true, false, false, false);
return skill.isToggle();
}
}

6
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Flag the attacker if it's a PlayerInstance outside a PvP area
final PlayerInstance player = getActingPlayer();
if (player != null)
if ((player != null) && (player != target))
{
AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
player.updatePvPStatus(target);
@ -4387,13 +4387,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Start attack stance and notify being attacked.
if ((this != target))
{
if (target.hasAI())
{
target.getAI().clientStartAutoAttack();
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
}
getAI().clientStartAutoAttack();
}
// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
double damage = damageValue;

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
{
return skill.isToggle();
}
damage = effected.getCurrentHp() - 1;
}
}
effector.doAttack(damage, effected, skill, true, false, false, false);
return skill.isToggle();
}
}

6
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Flag the attacker if it's a PlayerInstance outside a PvP area
final PlayerInstance player = getActingPlayer();
if (player != null)
if ((player != null) && (player != target))
{
AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
player.updatePvPStatus(target);
@ -4387,13 +4387,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Start attack stance and notify being attacked.
if ((this != target))
{
if (target.hasAI())
{
target.getAI().clientStartAutoAttack();
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
}
getAI().clientStartAutoAttack();
}
// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
double damage = damageValue;

2
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
{
return skill.isToggle();
}
damage = effected.getCurrentHp() - 1;
}
}
effector.doAttack(damage, effected, skill, true, false, false, false);
return skill.isToggle();
}
}

6
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Flag the attacker if it's a PlayerInstance outside a PvP area
final PlayerInstance player = getActingPlayer();
if (player != null)
if ((player != null) && (player != target))
{
AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
player.updatePvPStatus(target);
@ -4387,13 +4387,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Start attack stance and notify being attacked.
if ((this != target))
{
if (target.hasAI())
{
target.getAI().clientStartAutoAttack();
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
}
getAI().clientStartAutoAttack();
}
// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
double damage = damageValue;

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
{
return skill.isToggle();
}
damage = effected.getCurrentHp() - 1;
}
}
effector.doAttack(damage, effected, skill, true, false, false, false);
return skill.isToggle();
}
}

6
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -1167,7 +1167,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Flag the attacker if it's a PlayerInstance outside a PvP area
final PlayerInstance player = getActingPlayer();
if (player != null)
if ((player != null) && (player != target))
{
AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
player.updatePvPStatus(target);
@ -4400,13 +4400,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Start attack stance and notify being attacked.
if ((this != target))
{
if (target.hasAI())
{
target.getAI().clientStartAutoAttack();
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
}
getAI().clientStartAutoAttack();
}
// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
double damage = damageValue;

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
{
return skill.isToggle();
}
damage = effected.getCurrentHp() - 1;
}
}
effector.doAttack(damage, effected, skill, true, false, false, false);
return skill.isToggle();
}
}

6
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -1167,7 +1167,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Flag the attacker if it's a PlayerInstance outside a PvP area
final PlayerInstance player = getActingPlayer();
if (player != null)
if ((player != null) && (player != target))
{
AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
player.updatePvPStatus(target);
@ -4400,13 +4400,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Start attack stance and notify being attacked.
if ((this != target))
{
if (target.hasAI())
{
target.getAI().clientStartAutoAttack();
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
}
getAI().clientStartAutoAttack();
}
// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
double damage = damageValue;

2
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
{
return skill.isToggle();
}
damage = effected.getCurrentHp() - 1;
}
}
effector.doAttack(damage, effected, skill, true, false, false, false);
return skill.isToggle();
}
}

6
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -1167,7 +1167,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Flag the attacker if it's a PlayerInstance outside a PvP area
final PlayerInstance player = getActingPlayer();
if (player != null)
if ((player != null) && (player != target))
{
AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
player.updatePvPStatus(target);
@ -4399,13 +4399,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Start attack stance and notify being attacked.
if ((this != target))
{
if (target.hasAI())
{
target.getAI().clientStartAutoAttack();
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
}
getAI().clientStartAutoAttack();
}
// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
double damage = damageValue;

2
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java vendored
View File

@ -71,13 +71,11 @@ public class DamOverTimePercent extends AbstractEffect
{
return skill.isToggle();
}
damage = effected.getCurrentHp() - 1;
}
}
effector.doAttack(damage, effected, skill, true, false, false, false);
return skill.isToggle();
}
}

6
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -1166,7 +1166,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// Flag the attacker if it's a PlayerInstance outside a PvP area
final PlayerInstance player = getActingPlayer();
if (player != null)
if ((player != null) && (player != target))
{
AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
player.updatePvPStatus(target);
@ -4387,13 +4387,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
// Start attack stance and notify being attacked.
if ((this != target))
{
if (target.hasAI())
{
target.getAI().clientStartAutoAttack();
target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
}
getAI().clientStartAutoAttack();
}
// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
double damage = damageValue;