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

Fixed broken Pet target handler logic.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-09-11 21:17:37 +00:00
parent c47b581096
commit 2be8607e77
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/Pet.java vendored
View File

@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.targets.TargetType; import org.l2jmobius.gameserver.model.skill.targets.TargetType;
/** /**
* @author Manax * @author Mobius
*/ */
public class Pet implements ITargetTypeHandler public class Pet implements ITargetTypeHandler
{ {
@@ -36,7 +36,11 @@ public class Pet implements ITargetTypeHandler
@Override @Override
public WorldObject getTarget(Creature creature, WorldObject selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage) public WorldObject getTarget(Creature creature, WorldObject selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage)
{ {
if ((creature.isPet()) || creature.hasPet()) if (creature.isPet())
{
return creature;
}
if (creature.hasPet())
{ {
return creature.getPet(); return creature.getPet();
} }

8
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/Pet.java vendored
View File

@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.targets.TargetType; import org.l2jmobius.gameserver.model.skill.targets.TargetType;
/** /**
* @author Manax * @author Mobius
*/ */
public class Pet implements ITargetTypeHandler public class Pet implements ITargetTypeHandler
{ {
@@ -36,7 +36,11 @@ public class Pet implements ITargetTypeHandler
@Override @Override
public WorldObject getTarget(Creature creature, WorldObject selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage) public WorldObject getTarget(Creature creature, WorldObject selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage)
{ {
if ((creature.isPet()) || creature.hasPet()) if (creature.isPet())
{
return creature;
}
if (creature.hasPet())
{ {
return creature.getPet(); return creature.getPet();
} }

8
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/targethandlers/Pet.java vendored
View File

@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.targets.TargetType; import org.l2jmobius.gameserver.model.skill.targets.TargetType;
/** /**
* @author Manax * @author Mobius
*/ */
public class Pet implements ITargetTypeHandler public class Pet implements ITargetTypeHandler
{ {
@@ -36,7 +36,11 @@ public class Pet implements ITargetTypeHandler
@Override @Override
public WorldObject getTarget(Creature creature, WorldObject selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage) public WorldObject getTarget(Creature creature, WorldObject selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage)
{ {
if ((creature.isPet()) || creature.hasPet()) if (creature.isPet())
{
return creature;
}
if (creature.hasPet())
{ {
return creature.getPet(); return creature.getPet();
} }