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

Fixed PointBlank handler targeting dead characters.

Browse Source
This commit is contained in:
MobiusDev
2018-09-04 03:33:48 +00:00
parent f5e4c94194
commit 5967cd7be1
7 changed files with 63 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java vendored
View File

@@ -54,10 +54,16 @@ public class PointBlank implements IAffectScopeHandler
{ {
return false; return false;
} }
// XXX : Find a proper way to fix, if it's not proper. if (affectObject != null)
if ((affectObject != null) && (!c.isDead() || (skill.getAffectObject() == AffectObject.OBJECT_DEAD_NPC_BODY)) && !affectObject.checkAffectedObject(activeChar, c))
{ {
return false; if (c.isDead() && (skill.getAffectObject() != AffectObject.OBJECT_DEAD_NPC_BODY))
{
return false;
}
if (!affectObject.checkAffectedObject(activeChar, c))
{
return false;
}
} }
if (!GeoEngine.getInstance().canSeeTarget(target, c)) if (!GeoEngine.getInstance().canSeeTarget(target, c))
{ {

12
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java vendored
View File

@@ -54,10 +54,16 @@ public class PointBlank implements IAffectScopeHandler
{ {
return false; return false;
} }
// XXX : Find a proper way to fix, if it's not proper. if (affectObject != null)
if ((affectObject != null) && (!c.isDead() || (skill.getAffectObject() == AffectObject.OBJECT_DEAD_NPC_BODY)) && !affectObject.checkAffectedObject(activeChar, c))
{ {
return false; if (c.isDead() && (skill.getAffectObject() != AffectObject.OBJECT_DEAD_NPC_BODY))
{
return false;
}
if (!affectObject.checkAffectedObject(activeChar, c))
{
return false;
}
} }
if (!GeoEngine.getInstance().canSeeTarget(target, c)) if (!GeoEngine.getInstance().canSeeTarget(target, c))
{ {

12
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java vendored
View File

@@ -54,10 +54,16 @@ public class PointBlank implements IAffectScopeHandler
{ {
return false; return false;
} }
// XXX : Find a proper way to fix, if it's not proper. if (affectObject != null)
if ((affectObject != null) && (!c.isDead() || (skill.getAffectObject() == AffectObject.OBJECT_DEAD_NPC_BODY)) && !affectObject.checkAffectedObject(activeChar, c))
{ {
return false; if (c.isDead() && (skill.getAffectObject() != AffectObject.OBJECT_DEAD_NPC_BODY))
{
return false;
}
if (!affectObject.checkAffectedObject(activeChar, c))
{
return false;
}
} }
if (!GeoEngine.getInstance().canSeeTarget(target, c)) if (!GeoEngine.getInstance().canSeeTarget(target, c))
{ {

12
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java vendored
View File

@@ -54,10 +54,16 @@ public class PointBlank implements IAffectScopeHandler
{ {
return false; return false;
} }
// XXX : Find a proper way to fix, if it's not proper. if (affectObject != null)
if ((affectObject != null) && (!c.isDead() || (skill.getAffectObject() == AffectObject.OBJECT_DEAD_NPC_BODY)) && !affectObject.checkAffectedObject(activeChar, c))
{ {
return false; if (c.isDead() && (skill.getAffectObject() != AffectObject.OBJECT_DEAD_NPC_BODY))
{
return false;
}
if (!affectObject.checkAffectedObject(activeChar, c))
{
return false;
}
} }
if (!GeoEngine.getInstance().canSeeTarget(target, c)) if (!GeoEngine.getInstance().canSeeTarget(target, c))
{ {

12
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java vendored
View File

@@ -54,10 +54,16 @@ public class PointBlank implements IAffectScopeHandler
{ {
return false; return false;
} }
// XXX : Find a proper way to fix, if it's not proper. if (affectObject != null)
if ((affectObject != null) && (!c.isDead() || (skill.getAffectObject() == AffectObject.OBJECT_DEAD_NPC_BODY)) && !affectObject.checkAffectedObject(activeChar, c))
{ {
return false; if (c.isDead() && (skill.getAffectObject() != AffectObject.OBJECT_DEAD_NPC_BODY))
{
return false;
}
if (!affectObject.checkAffectedObject(activeChar, c))
{
return false;
}
} }
if (!GeoEngine.getInstance().canSeeTarget(target, c)) if (!GeoEngine.getInstance().canSeeTarget(target, c))
{ {

12
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java vendored
View File

@@ -54,10 +54,16 @@ public class PointBlank implements IAffectScopeHandler
{ {
return false; return false;
} }
// XXX : Find a proper way to fix, if it's not proper. if (affectObject != null)
if ((affectObject != null) && (!c.isDead() || (skill.getAffectObject() == AffectObject.OBJECT_DEAD_NPC_BODY)) && !affectObject.checkAffectedObject(activeChar, c))
{ {
return false; if (c.isDead() && (skill.getAffectObject() != AffectObject.OBJECT_DEAD_NPC_BODY))
{
return false;
}
if (!affectObject.checkAffectedObject(activeChar, c))
{
return false;
}
} }
if (!GeoEngine.getInstance().canSeeTarget(target, c)) if (!GeoEngine.getInstance().canSeeTarget(target, c))
{ {

12
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java vendored
View File

@@ -54,10 +54,16 @@ public class PointBlank implements IAffectScopeHandler
{ {
return false; return false;
} }
// XXX : Find a proper way to fix, if it's not proper. if (affectObject != null)
if ((affectObject != null) && (!c.isDead() || (skill.getAffectObject() == AffectObject.OBJECT_DEAD_NPC_BODY)) && !affectObject.checkAffectedObject(activeChar, c))
{ {
return false; if (c.isDead() && (skill.getAffectObject() != AffectObject.OBJECT_DEAD_NPC_BODY))
{
return false;
}
if (!affectObject.checkAffectedObject(activeChar, c))
{
return false;
}
} }
if (!GeoEngine.getInstance().canSeeTarget(target, c)) if (!GeoEngine.getInstance().canSeeTarget(target, c))
{ {