Removed type check from RequestTargetActionMenu.

This commit is contained in:
MobiusDevelopment 2019-09-21 08:58:49 +00:00
parent 340338d820
commit 1e5a718599
7 changed files with 35 additions and 63 deletions

View File

@ -28,13 +28,12 @@ import org.l2jmobius.gameserver.network.GameClient;
public class RequestTargetActionMenu implements IClientIncomingPacket public class RequestTargetActionMenu implements IClientIncomingPacket
{ {
private int _objectId; private int _objectId;
private int _type;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_objectId = packet.readD(); _objectId = packet.readD();
_type = packet.readH(); // action? packet.readH(); // action?
return true; return true;
} }
@ -47,8 +46,6 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
return; return;
} }
if (_type == 1)
{
for (WorldObject object : World.getInstance().getVisibleObjects(player, WorldObject.class)) for (WorldObject object : World.getInstance().getVisibleObjects(player, WorldObject.class))
{ {
if (_objectId == object.getObjectId()) if (_objectId == object.getObjectId())
@ -58,5 +55,4 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
} }
} }
} }
}
} }

View File

@ -28,13 +28,12 @@ import org.l2jmobius.gameserver.network.GameClient;
public class RequestTargetActionMenu implements IClientIncomingPacket public class RequestTargetActionMenu implements IClientIncomingPacket
{ {
private int _objectId; private int _objectId;
private int _type;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_objectId = packet.readD(); _objectId = packet.readD();
_type = packet.readH(); // action? packet.readH(); // action?
return true; return true;
} }
@ -47,8 +46,6 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
return; return;
} }
if (_type == 1)
{
for (WorldObject object : World.getInstance().getVisibleObjects(player, WorldObject.class)) for (WorldObject object : World.getInstance().getVisibleObjects(player, WorldObject.class))
{ {
if (_objectId == object.getObjectId()) if (_objectId == object.getObjectId())
@ -58,5 +55,4 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
} }
} }
} }
}
} }

View File

@ -28,13 +28,12 @@ import org.l2jmobius.gameserver.network.GameClient;
public class RequestTargetActionMenu implements IClientIncomingPacket public class RequestTargetActionMenu implements IClientIncomingPacket
{ {
private int _objectId; private int _objectId;
private int _type;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_objectId = packet.readD(); _objectId = packet.readD();
_type = packet.readH(); // action? packet.readH(); // action?
return true; return true;
} }
@ -47,8 +46,6 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
return; return;
} }
if (_type == 1)
{
for (WorldObject object : World.getInstance().getVisibleObjects(player, WorldObject.class)) for (WorldObject object : World.getInstance().getVisibleObjects(player, WorldObject.class))
{ {
if (_objectId == object.getObjectId()) if (_objectId == object.getObjectId())
@ -58,5 +55,4 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
} }
} }
} }
}
} }

View File

@ -28,13 +28,12 @@ import org.l2jmobius.gameserver.network.GameClient;
public class RequestTargetActionMenu implements IClientIncomingPacket public class RequestTargetActionMenu implements IClientIncomingPacket
{ {
private int _objectId; private int _objectId;
private int _type;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_objectId = packet.readD(); _objectId = packet.readD();
_type = packet.readH(); // action? packet.readH(); // action?
return true; return true;
} }
@ -47,8 +46,6 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
return; return;
} }
if (_type == 1)
{
for (WorldObject object : World.getInstance().getVisibleObjects(player, WorldObject.class)) for (WorldObject object : World.getInstance().getVisibleObjects(player, WorldObject.class))
{ {
if (_objectId == object.getObjectId()) if (_objectId == object.getObjectId())
@ -58,5 +55,4 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
} }
} }
} }
}
} }

View File

@ -28,13 +28,12 @@ import org.l2jmobius.gameserver.network.GameClient;
public class RequestTargetActionMenu implements IClientIncomingPacket public class RequestTargetActionMenu implements IClientIncomingPacket
{ {
private int _objectId; private int _objectId;
private int _type;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_objectId = packet.readD(); _objectId = packet.readD();
_type = packet.readH(); // action? packet.readH(); // action?
return true; return true;
} }
@ -47,8 +46,6 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
return; return;
} }
if (_type == 1)
{
for (WorldObject object : World.getInstance().getVisibleObjects(player, WorldObject.class)) for (WorldObject object : World.getInstance().getVisibleObjects(player, WorldObject.class))
{ {
if (_objectId == object.getObjectId()) if (_objectId == object.getObjectId())
@ -58,5 +55,4 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
} }
} }
} }
}
} }

View File

@ -28,13 +28,12 @@ import org.l2jmobius.gameserver.network.GameClient;
public class RequestTargetActionMenu implements IClientIncomingPacket public class RequestTargetActionMenu implements IClientIncomingPacket
{ {
private int _objectId; private int _objectId;
private int _type;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_objectId = packet.readD(); _objectId = packet.readD();
_type = packet.readH(); // action? packet.readH(); // action?
return true; return true;
} }
@ -47,8 +46,6 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
return; return;
} }
if (_type == 1)
{
for (WorldObject object : World.getInstance().getVisibleObjects(player, WorldObject.class)) for (WorldObject object : World.getInstance().getVisibleObjects(player, WorldObject.class))
{ {
if (_objectId == object.getObjectId()) if (_objectId == object.getObjectId())
@ -58,5 +55,4 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
} }
} }
} }
}
} }

View File

@ -28,13 +28,12 @@ import org.l2jmobius.gameserver.network.GameClient;
public class RequestTargetActionMenu implements IClientIncomingPacket public class RequestTargetActionMenu implements IClientIncomingPacket
{ {
private int _objectId; private int _objectId;
private int _type;
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
{ {
_objectId = packet.readD(); _objectId = packet.readD();
_type = packet.readH(); // action? packet.readH(); // action?
return true; return true;
} }
@ -47,8 +46,6 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
return; return;
} }
if (_type == 1)
{
for (WorldObject object : World.getInstance().getVisibleObjects(player, WorldObject.class)) for (WorldObject object : World.getInstance().getVisibleObjects(player, WorldObject.class))
{ {
if (_objectId == object.getObjectId()) if (_objectId == object.getObjectId())
@ -58,5 +55,4 @@ public class RequestTargetActionMenu implements IClientIncomingPacket
} }
} }
} }
}
} }