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

ExAutoPlaySettingSend proper long range value.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-03-31 22:01:05 +00:00
parent 6145503dd6
commit 80f054614c
12 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
View File

@@ -44,7 +44,7 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
_active = packet.readC() == 1; _active = packet.readC() == 1;
_pickUp = packet.readC() == 1; _pickUp = packet.readC() == 1;
_nextTargetMode = packet.readH(); _nextTargetMode = packet.readH();
_longRange = packet.readC() == 0; _longRange = packet.readC() != 0;
_potionPercent = packet.readD(); _potionPercent = packet.readD();
_respectfulHunting = packet.readC() == 1; _respectfulHunting = packet.readC() == 1;
return true; return true;
@@ -67,9 +67,13 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
return; return;
} }
player.getAutoPlaySettings().setPickup(_pickUp);
player.getAutoPlaySettings().setLongRange(_longRange);
player.getAutoPlaySettings().setRespectfulHunting(_respectfulHunting);
if (_active) if (_active)
{ {
AutoPlayTaskManager.getInstance().doAutoPlay(player, _pickUp, _longRange, _respectfulHunting); AutoPlayTaskManager.getInstance().doAutoPlay(player);
} }
else else
{ {

8
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
View File

@@ -130,7 +130,7 @@ public class AutoPlayTaskManager
continue TARGET; continue TARGET;
} }
// Check monster target. // Check monster target.
if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))) if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
{ {
continue TARGET; continue TARGET;
} }
@@ -167,12 +167,8 @@ public class AutoPlayTaskManager
}, 1000, 1000); }, 1000, 1000);
} }
public void doAutoPlay(PlayerInstance player, boolean pickup, boolean longRange, boolean respectfulHunting) public void doAutoPlay(PlayerInstance player)
{ {
player.getAutoPlaySettings().setPickup(pickup);
player.getAutoPlaySettings().setLongRange(longRange);
player.getAutoPlaySettings().setRespectfulHunting(respectfulHunting);
if (!PLAYERS.contains(player)) if (!PLAYERS.contains(player))
{ {
player.onActionRequest(); player.onActionRequest();

8
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
View File

@@ -44,7 +44,7 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
_active = packet.readC() == 1; _active = packet.readC() == 1;
_pickUp = packet.readC() == 1; _pickUp = packet.readC() == 1;
_nextTargetMode = packet.readH(); _nextTargetMode = packet.readH();
_longRange = packet.readC() == 0; _longRange = packet.readC() != 0;
_potionPercent = packet.readD(); _potionPercent = packet.readD();
packet.readD(); // 272 packet.readD(); // 272
_respectfulHunting = packet.readC() == 1; _respectfulHunting = packet.readC() == 1;
@@ -68,9 +68,13 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
return; return;
} }
player.getAutoPlaySettings().setPickup(_pickUp);
player.getAutoPlaySettings().setLongRange(_longRange);
player.getAutoPlaySettings().setRespectfulHunting(_respectfulHunting);
if (_active) if (_active)
{ {
AutoPlayTaskManager.getInstance().doAutoPlay(player, _pickUp, _longRange, _respectfulHunting); AutoPlayTaskManager.getInstance().doAutoPlay(player);
} }
else else
{ {

8
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
View File

@@ -130,7 +130,7 @@ public class AutoPlayTaskManager
continue TARGET; continue TARGET;
} }
// Check monster target. // Check monster target.
if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))) if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
{ {
continue TARGET; continue TARGET;
} }
@@ -167,12 +167,8 @@ public class AutoPlayTaskManager
}, 1000, 1000); }, 1000, 1000);
} }
public void doAutoPlay(PlayerInstance player, boolean pickup, boolean longRange, boolean respectfulHunting) public void doAutoPlay(PlayerInstance player)
{ {
player.getAutoPlaySettings().setPickup(pickup);
player.getAutoPlaySettings().setLongRange(longRange);
player.getAutoPlaySettings().setRespectfulHunting(respectfulHunting);
if (!PLAYERS.contains(player)) if (!PLAYERS.contains(player))
{ {
player.onActionRequest(); player.onActionRequest();

8
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
View File

@@ -44,7 +44,7 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
_active = packet.readC() == 1; _active = packet.readC() == 1;
_pickUp = packet.readC() == 1; _pickUp = packet.readC() == 1;
_nextTargetMode = packet.readH(); _nextTargetMode = packet.readH();
_longRange = packet.readC() == 0; _longRange = packet.readC() != 0;
_potionPercent = packet.readD(); _potionPercent = packet.readD();
packet.readD(); // 272 packet.readD(); // 272
_respectfulHunting = packet.readC() == 1; _respectfulHunting = packet.readC() == 1;
@@ -68,9 +68,13 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
return; return;
} }
player.getAutoPlaySettings().setPickup(_pickUp);
player.getAutoPlaySettings().setLongRange(_longRange);
player.getAutoPlaySettings().setRespectfulHunting(_respectfulHunting);
if (_active) if (_active)
{ {
AutoPlayTaskManager.getInstance().doAutoPlay(player, _pickUp, _longRange, _respectfulHunting); AutoPlayTaskManager.getInstance().doAutoPlay(player);
} }
else else
{ {

8
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
View File

@@ -130,7 +130,7 @@ public class AutoPlayTaskManager
continue TARGET; continue TARGET;
} }
// Check monster target. // Check monster target.
if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))) if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
{ {
continue TARGET; continue TARGET;
} }
@@ -167,12 +167,8 @@ public class AutoPlayTaskManager
}, 1000, 1000); }, 1000, 1000);
} }
public void doAutoPlay(PlayerInstance player, boolean pickup, boolean longRange, boolean respectfulHunting) public void doAutoPlay(PlayerInstance player)
{ {
player.getAutoPlaySettings().setPickup(pickup);
player.getAutoPlaySettings().setLongRange(longRange);
player.getAutoPlaySettings().setRespectfulHunting(respectfulHunting);
if (!PLAYERS.contains(player)) if (!PLAYERS.contains(player))
{ {
player.onActionRequest(); player.onActionRequest();

8
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
View File

@@ -44,7 +44,7 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
_active = packet.readC() == 1; _active = packet.readC() == 1;
_pickUp = packet.readC() == 1; _pickUp = packet.readC() == 1;
_nextTargetMode = packet.readH(); _nextTargetMode = packet.readH();
_longRange = packet.readC() == 0; _longRange = packet.readC() != 0;
_potionPercent = packet.readD(); _potionPercent = packet.readD();
_respectfulHunting = packet.readC() == 1; _respectfulHunting = packet.readC() == 1;
return true; return true;
@@ -67,9 +67,13 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
return; return;
} }
player.getAutoPlaySettings().setPickup(_pickUp);
player.getAutoPlaySettings().setLongRange(_longRange);
player.getAutoPlaySettings().setRespectfulHunting(_respectfulHunting);
if (_active) if (_active)
{ {
AutoPlayTaskManager.getInstance().doAutoPlay(player, _pickUp, _longRange, _respectfulHunting); AutoPlayTaskManager.getInstance().doAutoPlay(player);
} }
else else
{ {

8
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
View File

@@ -130,7 +130,7 @@ public class AutoPlayTaskManager
continue TARGET; continue TARGET;
} }
// Check monster target. // Check monster target.
if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))) if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
{ {
continue TARGET; continue TARGET;
} }
@@ -167,12 +167,8 @@ public class AutoPlayTaskManager
}, 1000, 1000); }, 1000, 1000);
} }
public void doAutoPlay(PlayerInstance player, boolean pickup, boolean longRange, boolean respectfulHunting) public void doAutoPlay(PlayerInstance player)
{ {
player.getAutoPlaySettings().setPickup(pickup);
player.getAutoPlaySettings().setLongRange(longRange);
player.getAutoPlaySettings().setRespectfulHunting(respectfulHunting);
if (!PLAYERS.contains(player)) if (!PLAYERS.contains(player))
{ {
player.onActionRequest(); player.onActionRequest();

8
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
View File

@@ -44,7 +44,7 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
_active = packet.readC() == 1; _active = packet.readC() == 1;
_pickUp = packet.readC() == 1; _pickUp = packet.readC() == 1;
_nextTargetMode = packet.readH(); _nextTargetMode = packet.readH();
_longRange = packet.readC() == 0; _longRange = packet.readC() != 0;
_potionPercent = packet.readD(); _potionPercent = packet.readD();
packet.readD(); // 272 packet.readD(); // 272
_respectfulHunting = packet.readC() == 1; _respectfulHunting = packet.readC() == 1;
@@ -68,9 +68,13 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
return; return;
} }
player.getAutoPlaySettings().setPickup(_pickUp);
player.getAutoPlaySettings().setLongRange(_longRange);
player.getAutoPlaySettings().setRespectfulHunting(_respectfulHunting);
if (_active) if (_active)
{ {
AutoPlayTaskManager.getInstance().doAutoPlay(player, _pickUp, _longRange, _respectfulHunting); AutoPlayTaskManager.getInstance().doAutoPlay(player);
} }
else else
{ {

8
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
View File

@@ -130,7 +130,7 @@ public class AutoPlayTaskManager
continue TARGET; continue TARGET;
} }
// Check monster target. // Check monster target.
if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))) if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
{ {
continue TARGET; continue TARGET;
} }
@@ -167,12 +167,8 @@ public class AutoPlayTaskManager
}, 1000, 1000); }, 1000, 1000);
} }
public void doAutoPlay(PlayerInstance player, boolean pickup, boolean longRange, boolean respectfulHunting) public void doAutoPlay(PlayerInstance player)
{ {
player.getAutoPlaySettings().setPickup(pickup);
player.getAutoPlaySettings().setLongRange(longRange);
player.getAutoPlaySettings().setRespectfulHunting(respectfulHunting);
if (!PLAYERS.contains(player)) if (!PLAYERS.contains(player))
{ {
player.onActionRequest(); player.onActionRequest();

8
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/autoplay/ExAutoPlaySetting.java
View File

@@ -44,7 +44,7 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
_active = packet.readC() == 1; _active = packet.readC() == 1;
_pickUp = packet.readC() == 1; _pickUp = packet.readC() == 1;
_nextTargetMode = packet.readH(); _nextTargetMode = packet.readH();
_longRange = packet.readC() == 0; _longRange = packet.readC() != 0;
_potionPercent = packet.readD(); _potionPercent = packet.readD();
packet.readD(); // 272 packet.readD(); // 272
_respectfulHunting = packet.readC() == 1; _respectfulHunting = packet.readC() == 1;
@@ -68,9 +68,13 @@ public class ExAutoPlaySetting implements IClientIncomingPacket
return; return;
} }
player.getAutoPlaySettings().setPickup(_pickUp);
player.getAutoPlaySettings().setLongRange(_longRange);
player.getAutoPlaySettings().setRespectfulHunting(_respectfulHunting);
if (_active) if (_active)
{ {
AutoPlayTaskManager.getInstance().doAutoPlay(player, _pickUp, _longRange, _respectfulHunting); AutoPlayTaskManager.getInstance().doAutoPlay(player);
} }
else else
{ {

8
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/taskmanager/AutoPlayTaskManager.java
View File

@@ -130,7 +130,7 @@ public class AutoPlayTaskManager
continue TARGET; continue TARGET;
} }
// Check monster target. // Check monster target.
if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))) if (player.getAutoPlaySettings().isRespectfulHunting() && (nearby.getTarget() != null) && (nearby.getTarget() != player) && !player.getServitors().containsKey(nearby.getTarget().getObjectId()))
{ {
continue TARGET; continue TARGET;
} }
@@ -167,12 +167,8 @@ public class AutoPlayTaskManager
}, 1000, 1000); }, 1000, 1000);
} }
public void doAutoPlay(PlayerInstance player, boolean pickup, boolean longRange, boolean respectfulHunting) public void doAutoPlay(PlayerInstance player)
{ {
player.getAutoPlaySettings().setPickup(pickup);
player.getAutoPlaySettings().setLongRange(longRange);
player.getAutoPlaySettings().setRespectfulHunting(respectfulHunting);
if (!PLAYERS.contains(player)) if (!PLAYERS.contains(player))
{ {
player.onActionRequest(); player.onActionRequest();