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

Use of canInteract for NPC onBypassFeedback method.

Browse Source
This commit is contained in:
MobiusDev
2019-01-02 21:45:20 +00:00
parent 3ccdb2eb84
commit 088f57bc41
12 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@ -622,7 +622,7 @@ public class L2Npc extends L2Character
*/ */
public void onBypassFeedback(L2PcInstance player, String command) public void onBypassFeedback(L2PcInstance player, String command)
{ {
// if (canInteract(player)) if (canInteract(player))
{ {
final IBypassHandler handler = BypassHandler.getInstance().getHandler(command); final IBypassHandler handler = BypassHandler.getInstance().getHandler(command);
if (handler != null) if (handler != null)

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@ -622,7 +622,7 @@ public class L2Npc extends L2Character
*/ */
public void onBypassFeedback(L2PcInstance player, String command) public void onBypassFeedback(L2PcInstance player, String command)
{ {
// if (canInteract(player)) if (canInteract(player))
{ {
final IBypassHandler handler = BypassHandler.getInstance().getHandler(command); final IBypassHandler handler = BypassHandler.getInstance().getHandler(command);
if (handler != null) if (handler != null)

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@ -622,7 +622,7 @@ public class L2Npc extends L2Character
*/ */
public void onBypassFeedback(L2PcInstance player, String command) public void onBypassFeedback(L2PcInstance player, String command)
{ {
// if (canInteract(player)) if (canInteract(player))
{ {
final IBypassHandler handler = BypassHandler.getInstance().getHandler(command); final IBypassHandler handler = BypassHandler.getInstance().getHandler(command);
if (handler != null) if (handler != null)

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@ -622,7 +622,7 @@ public class L2Npc extends L2Character
*/ */
public void onBypassFeedback(L2PcInstance player, String command) public void onBypassFeedback(L2PcInstance player, String command)
{ {
// if (canInteract(player)) if (canInteract(player))
{ {
final IBypassHandler handler = BypassHandler.getInstance().getHandler(command); final IBypassHandler handler = BypassHandler.getInstance().getHandler(command);
if (handler != null) if (handler != null)

2
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@ -622,7 +622,7 @@ public class L2Npc extends L2Character
*/ */
public void onBypassFeedback(L2PcInstance player, String command) public void onBypassFeedback(L2PcInstance player, String command)
{ {
// if (canInteract(player)) if (canInteract(player))
{ {
final IBypassHandler handler = BypassHandler.getInstance().getHandler(command); final IBypassHandler handler = BypassHandler.getInstance().getHandler(command);
if (handler != null) if (handler != null)

2
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@ -622,7 +622,7 @@ public class L2Npc extends L2Character
*/ */
public void onBypassFeedback(L2PcInstance player, String command) public void onBypassFeedback(L2PcInstance player, String command)
{ {
// if (canInteract(player)) if (canInteract(player))
{ {
final IBypassHandler handler = BypassHandler.getInstance().getHandler(command); final IBypassHandler handler = BypassHandler.getInstance().getHandler(command);
if (handler != null) if (handler != null)

25
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java
View File

@ -701,13 +701,30 @@ public class L2NpcInstance extends L2Character
*/ */
protected boolean canInteract(L2PcInstance player) protected boolean canInteract(L2PcInstance player)
{ {
// TODO: NPC busy check etc... if (player.isCastingNow())
{
if (!isInsideRadius(player, INTERACTION_DISTANCE, false, false)) return false;
}
else if (player.isDead() || player.isFakeDeath())
{
return false;
}
else if (player.isSitting())
{
return false;
}
else if (player.isInStoreMode())
{
return false;
}
else if (!isInsideRadius(player, INTERACTION_DISTANCE, false, false))
{
return false;
}
else if (player.getInstanceId() != getInstanceId())
{ {
return false; return false;
} }
return true; return true;
} }

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@ -559,11 +559,7 @@ public class L2Npc extends L2Character
{ {
return false; return false;
} }
else if ((player.getInstanceId() != getInstanceId()) && (player.getInstanceId() != -1)) else if (player.getInstanceId() != getInstanceId())
{
return false;
}
else if (_isBusy)
{ {
return false; return false;
} }
@ -707,7 +703,7 @@ public class L2Npc extends L2Character
*/ */
public void onBypassFeedback(L2PcInstance player, String command) public void onBypassFeedback(L2PcInstance player, String command)
{ {
// if (canInteract(player)) if (canInteract(player))
{ {
if (_isBusy && (_busyMessage.length() > 0)) if (_isBusy && (_busyMessage.length() > 0))
{ {

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@ -622,7 +622,7 @@ public class L2Npc extends L2Character
*/ */
public void onBypassFeedback(L2PcInstance player, String command) public void onBypassFeedback(L2PcInstance player, String command)
{ {
// if (canInteract(player)) if (canInteract(player))
{ {
final IBypassHandler handler = BypassHandler.getInstance().getHandler(command); final IBypassHandler handler = BypassHandler.getInstance().getHandler(command);
if (handler != null) if (handler != null)

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@ -622,7 +622,7 @@ public class L2Npc extends L2Character
*/ */
public void onBypassFeedback(L2PcInstance player, String command) public void onBypassFeedback(L2PcInstance player, String command)
{ {
// if (canInteract(player)) if (canInteract(player))
{ {
final IBypassHandler handler = BypassHandler.getInstance().getHandler(command); final IBypassHandler handler = BypassHandler.getInstance().getHandler(command);
if (handler != null) if (handler != null)

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@ -622,7 +622,7 @@ public class L2Npc extends L2Character
*/ */
public void onBypassFeedback(L2PcInstance player, String command) public void onBypassFeedback(L2PcInstance player, String command)
{ {
// if (canInteract(player)) if (canInteract(player))
{ {
final IBypassHandler handler = BypassHandler.getInstance().getHandler(command); final IBypassHandler handler = BypassHandler.getInstance().getHandler(command);
if (handler != null) if (handler != null)

2
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@ -622,7 +622,7 @@ public class L2Npc extends L2Character
*/ */
public void onBypassFeedback(L2PcInstance player, String command) public void onBypassFeedback(L2PcInstance player, String command)
{ {
// if (canInteract(player)) if (canInteract(player))
{ {
final IBypassHandler handler = BypassHandler.getInstance().getHandler(command); final IBypassHandler handler = BypassHandler.getInstance().getHandler(command);
if (handler != null) if (handler != null)