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

KnockBack and PullBack effects should ignore town NPCs.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-03-31 20:40:13 +00:00
parent c40390286a
commit 1fd1f80099
22 changed files with 44 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -150,7 +150,8 @@ public final class KnockBack extends AbstractEffect
private void knockBack(Creature effector, Creature effected) private void knockBack(Creature effector, Creature effected)
{ {
if ((effected == null) || effected.isRaid()) // Prevent knocking back raids and town NPCs.
if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{ {
return; return;
} }

10
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PullBack.java vendored
View File

@@ -61,14 +61,8 @@ public final class PullBack extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
// Prevent pulling raids. // Prevent pulling raids and town NPCs.
if ((effected == null) || effected.isRaid()) if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{
return;
}
// Prevent pulling NPCs.
if (!effected.isPlayable() && !effected.isMonster())
{ {
return; return;
} }

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -150,7 +150,8 @@ public final class KnockBack extends AbstractEffect
private void knockBack(Creature effector, Creature effected) private void knockBack(Creature effector, Creature effected)
{ {
if ((effected == null) || effected.isRaid()) // Prevent knocking back raids and town NPCs.
if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{ {
return; return;
} }

10
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java vendored
View File

@@ -61,14 +61,8 @@ public final class PullBack extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
// Prevent pulling raids. // Prevent pulling raids and town NPCs.
if ((effected == null) || effected.isRaid()) if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{
return;
}
// Prevent pulling NPCs.
if (!effected.isPlayable() && !effected.isMonster())
{ {
return; return;
} }

3
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -150,7 +150,8 @@ public final class KnockBack extends AbstractEffect
private void knockBack(Creature effector, Creature effected) private void knockBack(Creature effector, Creature effected)
{ {
if ((effected == null) || effected.isRaid()) // Prevent knocking back raids and town NPCs.
if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{ {
return; return;
} }

10
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java vendored
View File

@@ -61,14 +61,8 @@ public final class PullBack extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
// Prevent pulling raids. // Prevent pulling raids and town NPCs.
if ((effected == null) || effected.isRaid()) if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{
return;
}
// Prevent pulling NPCs.
if (!effected.isPlayable() && !effected.isMonster())
{ {
return; return;
} }

3
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -150,7 +150,8 @@ public final class KnockBack extends AbstractEffect
private void knockBack(Creature effector, Creature effected) private void knockBack(Creature effector, Creature effected)
{ {
if ((effected == null) || effected.isRaid()) // Prevent knocking back raids and town NPCs.
if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{ {
return; return;
} }

10
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PullBack.java vendored
View File

@@ -61,14 +61,8 @@ public final class PullBack extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
// Prevent pulling raids. // Prevent pulling raids and town NPCs.
if ((effected == null) || effected.isRaid()) if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{
return;
}
// Prevent pulling NPCs.
if (!effected.isPlayable() && !effected.isMonster())
{ {
return; return;
} }

3
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -150,7 +150,8 @@ public final class KnockBack extends AbstractEffect
private void knockBack(Creature effector, Creature effected) private void knockBack(Creature effector, Creature effected)
{ {
if ((effected == null) || effected.isRaid()) // Prevent knocking back raids and town NPCs.
if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{ {
return; return;
} }

10
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PullBack.java vendored
View File

@@ -61,14 +61,8 @@ public final class PullBack extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
// Prevent pulling raids. // Prevent pulling raids and town NPCs.
if ((effected == null) || effected.isRaid()) if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{
return;
}
// Prevent pulling NPCs.
if (!effected.isPlayable() && !effected.isMonster())
{ {
return; return;
} }

3
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -150,7 +150,8 @@ public final class KnockBack extends AbstractEffect
private void knockBack(Creature effector, Creature effected) private void knockBack(Creature effector, Creature effected)
{ {
if ((effected == null) || effected.isRaid()) // Prevent knocking back raids and town NPCs.
if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{ {
return; return;
} }

10
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PullBack.java vendored
View File

@@ -61,14 +61,8 @@ public final class PullBack extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
// Prevent pulling raids. // Prevent pulling raids and town NPCs.
if ((effected == null) || effected.isRaid()) if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{
return;
}
// Prevent pulling NPCs.
if (!effected.isPlayable() && !effected.isMonster())
{ {
return; return;
} }

3
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -150,7 +150,8 @@ public final class KnockBack extends AbstractEffect
private void knockBack(Creature effector, Creature effected) private void knockBack(Creature effector, Creature effected)
{ {
if ((effected == null) || effected.isRaid()) // Prevent knocking back raids and town NPCs.
if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{ {
return; return;
} }

10
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PullBack.java vendored
View File

@@ -61,14 +61,8 @@ public final class PullBack extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
// Prevent pulling raids. // Prevent pulling raids and town NPCs.
if ((effected == null) || effected.isRaid()) if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{
return;
}
// Prevent pulling NPCs.
if (!effected.isPlayable() && !effected.isMonster())
{ {
return; return;
} }

3
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -102,7 +102,8 @@ public final class KnockBack extends AbstractEffect
private void knockBack(Creature effector, Creature effected) private void knockBack(Creature effector, Creature effected)
{ {
if ((effected == null) || effected.isRaid()) // Prevent knocking back raids and town NPCs.
if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{ {
return; return;
} }

10
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PullBack.java vendored
View File

@@ -61,14 +61,8 @@ public final class PullBack extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
// Prevent pulling raids. // Prevent pulling raids and town NPCs.
if ((effected == null) || effected.isRaid()) if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{
return;
}
// Prevent pulling NPCs.
if (!effected.isPlayable() && !effected.isMonster())
{ {
return; return;
} }

3
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -102,7 +102,8 @@ public final class KnockBack extends AbstractEffect
private void knockBack(Creature effector, Creature effected) private void knockBack(Creature effector, Creature effected)
{ {
if ((effected == null) || effected.isRaid()) // Prevent knocking back raids and town NPCs.
if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{ {
return; return;
} }

10
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PullBack.java vendored
View File

@@ -61,14 +61,8 @@ public final class PullBack extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
// Prevent pulling raids. // Prevent pulling raids and town NPCs.
if ((effected == null) || effected.isRaid()) if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{
return;
}
// Prevent pulling NPCs.
if (!effected.isPlayable() && !effected.isMonster())
{ {
return; return;
} }

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

@@ -102,7 +102,8 @@ public final class KnockBack extends AbstractEffect
private void knockBack(Creature effector, Creature effected) private void knockBack(Creature effector, Creature effected)
{ {
if ((effected == null) || effected.isRaid()) // Prevent knocking back raids and town NPCs.
if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{ {
return; return;
} }

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

@@ -61,14 +61,8 @@ public final class PullBack extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
// Prevent pulling raids. // Prevent pulling raids and town NPCs.
if ((effected == null) || effected.isRaid()) if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{
return;
}
// Prevent pulling NPCs.
if (!effected.isPlayable() && !effected.isMonster())
{ {
return; return;
} }

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

@@ -102,7 +102,8 @@ public final class KnockBack extends AbstractEffect
private void knockBack(Creature effector, Creature effected) private void knockBack(Creature effector, Creature effected)
{ {
if ((effected == null) || effected.isRaid()) // Prevent knocking back raids and town NPCs.
if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{ {
return; return;
} }

10
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PullBack.java vendored
View File

@@ -61,14 +61,8 @@ public final class PullBack extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
// Prevent pulling raids. // Prevent pulling raids and town NPCs.
if ((effected == null) || effected.isRaid()) if ((effected == null) || effected.isRaid() || (effected.isNpc() && !effected.isAttackable()))
{
return;
}
// Prevent pulling NPCs.
if (!effected.isPlayable() && !effected.isMonster())
{ {
return; return;
} }