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

Improved some target handlers.

Browse Source
This commit is contained in:
MobiusDev 2017-10-12 00:00:46 +00:00
parent a1b85758ff
commit a1d3b67221
12 changed files with 36 additions and 12 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/targethandlers/Item.java vendored
View File

@ -37,6 +37,6 @@ public class Item implements ITargetTypeHandler
@Override
public L2Object getTarget(L2Character activeChar, L2Object selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage)
{
return null;
return (selectedTarget != null) && selectedTarget.isItem() ? selectedTarget : null;
}
}

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/MyParty.java vendored
View File

@ -48,6 +48,6 @@ public class MyParty implements ITargetTypeHandler
}
}
return null;
return activeChar;
}
}

8
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/Others.java vendored
View File

@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.targets.TargetType;
import com.l2jmobius.gameserver.network.SystemMessageId;
/**
* Target other things (skills with this target type appear to be disabled).
@ -37,6 +38,11 @@ public class Others implements ITargetTypeHandler
@Override
public L2Object getTarget(L2Character activeChar, L2Object selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage)
{
return null;
if (selectedTarget == activeChar)
{
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ON_YOURSELF);
return null;
}
return selectedTarget;
}
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/Item.java vendored
View File

@ -37,6 +37,6 @@ public class Item implements ITargetTypeHandler
@Override
public L2Object getTarget(L2Character activeChar, L2Object selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage)
{
return null;
return (selectedTarget != null) && selectedTarget.isItem() ? selectedTarget : null;
}
}

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/MyParty.java vendored
View File

@ -48,6 +48,6 @@ public class MyParty implements ITargetTypeHandler
}
}
return null;
return activeChar;
}
}

8
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/Others.java vendored
View File

@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.targets.TargetType;
import com.l2jmobius.gameserver.network.SystemMessageId;
/**
* Target other things (skills with this target type appear to be disabled).
@ -37,6 +38,11 @@ public class Others implements ITargetTypeHandler
@Override
public L2Object getTarget(L2Character activeChar, L2Object selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage)
{
return null;
if (selectedTarget == activeChar)
{
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ON_YOURSELF);
return null;
}
return selectedTarget;
}
}

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/Item.java vendored
View File

@ -37,6 +37,6 @@ public class Item implements ITargetTypeHandler
@Override
public L2Object getTarget(L2Character activeChar, L2Object selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage)
{
return null;
return (selectedTarget != null) && selectedTarget.isItem() ? selectedTarget : null;
}
}

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/MyParty.java vendored
View File

@ -48,6 +48,6 @@ public class MyParty implements ITargetTypeHandler
}
}
return null;
return activeChar;
}
}

8
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/Others.java vendored
View File

@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.targets.TargetType;
import com.l2jmobius.gameserver.network.SystemMessageId;
/**
* Target other things (skills with this target type appear to be disabled).
@ -37,6 +38,11 @@ public class Others implements ITargetTypeHandler
@Override
public L2Object getTarget(L2Character activeChar, L2Object selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage)
{
return null;
if (selectedTarget == activeChar)
{
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ON_YOURSELF);
return null;
}
return selectedTarget;
}
}

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/Item.java vendored
View File

@ -37,6 +37,6 @@ public class Item implements ITargetTypeHandler
@Override
public L2Object getTarget(L2Character activeChar, L2Object selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage)
{
return null;
return (selectedTarget != null) && selectedTarget.isItem() ? selectedTarget : null;
}
}

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/MyParty.java vendored
View File

@ -48,6 +48,6 @@ public class MyParty implements ITargetTypeHandler
}
}
return null;
return activeChar;
}
}

8
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/Others.java vendored
View File

@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.targets.TargetType;
import com.l2jmobius.gameserver.network.SystemMessageId;
/**
* Target other things (skills with this target type appear to be disabled).
@ -37,6 +38,11 @@ public class Others implements ITargetTypeHandler
@Override
public L2Object getTarget(L2Character activeChar, L2Object selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage)
{
return null;
if (selectedTarget == activeChar)
{
activeChar.sendPacket(SystemMessageId.YOU_CANNOT_USE_THIS_ON_YOURSELF);
return null;
}
return selectedTarget;
}
}