diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 327ad69766..59a7d530cc 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 327ad69766..59a7d530cc 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 327ad69766..59a7d530cc 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 327ad69766..59a7d530cc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index 327ad69766..59a7d530cc 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index d10a19a337..703984af41 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index d10a19a337..703984af41 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index d10a19a337..703984af41 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3f5d171488..98e20bac08 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -634,8 +634,7 @@ abstract class AbstractAI implements Ctrl
// CharMoveToLocation msg = new CharMoveToLocation(_actor);
if (((PlayerInstance) _actor).getBoat() != null)
{
- final MoveToLocationInVehicle msg = new MoveToLocationInVehicle(_actor, destination, origin);
- _actor.broadcastPacket(msg);
+ _actor.broadcastPacket(new MoveToLocationInVehicle(_actor, destination, origin));
}
}
else
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
index e852502c34..080884966d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -5541,7 +5541,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
if (distFraction > 1)
{
// Set the position of the Creature to the destination
- super.getPosition().setXYZ(m._xDestination, m._yDestination, m._zDestination);
+ super.setXYZ(m._xDestination, m._yDestination, m._zDestination);
if (this instanceof BoatInstance)
{
((BoatInstance) this).updatePeopleInTheBoat(m._xDestination, m._yDestination, m._zDestination);
@@ -5557,7 +5557,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
m._yAccurate += dy * distFraction;
// Set the position of the Creature to estimated after parcial move
- super.getPosition().setXYZ((int) m._xAccurate, (int) m._yAccurate, zPrev + (int) ((dz * distFraction) + 0.5));
+ super.setXYZ((int) m._xAccurate, (int) m._yAccurate, zPrev + (int) ((dz * distFraction) + 0.5));
if (this instanceof BoatInstance)
{
((BoatInstance) this).updatePeopleInTheBoat((int) m._xAccurate, (int) m._yAccurate, zPrev + (int) ((dz * distFraction) + 0.5));
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java
index 3c190f533a..070f175ccf 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BoatInstance.java
@@ -147,7 +147,7 @@ public class BoatInstance extends Creature
final PlayerInstance player = inboat.get(i);
if ((player != null) && player.isInBoat() && (player.getBoat() == this))
{
- player.getPosition().setXYZ(x, y, z);
+ player.setXYZ(x, y, z);
player.revalidateZone(false);
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index d4d687c042..6ce52f5f9b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -366,7 +366,6 @@ public class PlayerInstance extends Playable
private int _duelState = Duel.DUELSTATE_NODUEL;
private int _duelId = 0;
private SystemMessageId _noDuelReason = SystemMessageId.THERE_IS_NO_OPPONENT_TO_RECEIVE_YOUR_CHALLENGE_FOR_A_DUEL;
- private boolean _inBoat;
private BoatInstance _boat;
private Location _inBoatPosition;
private int _mountType;
@@ -14384,16 +14383,7 @@ public class PlayerInstance extends Playable
*/
public boolean isInBoat()
{
- return _inBoat;
- }
-
- /**
- * Sets the in boat.
- * @param inBoat The inBoat to set.
- */
- public void setInBoat(boolean inBoat)
- {
- _inBoat = inBoat;
+ return _boat != null;
}
/**
@@ -14414,6 +14404,24 @@ public class PlayerInstance extends Playable
_boat = boat;
}
+ /**
+ * Gets the in boat position.
+ * @return the in boat position
+ */
+ public Location getBoatPosition()
+ {
+ return _inBoatPosition;
+ }
+
+ /**
+ * Sets the in boat position.
+ * @param location the new in boat location
+ */
+ public void setBoatPosition(Location location)
+ {
+ _inBoatPosition = location;
+ }
+
/**
* Sets the in crystallize.
* @param inCrystallize the new in crystallize
@@ -14432,24 +14440,6 @@ public class PlayerInstance extends Playable
return _inCrystallize;
}
- /**
- * Gets the in boat position.
- * @return the in boat position
- */
- public Location getInBoatPosition()
- {
- return _inBoatPosition;
- }
-
- /**
- * Sets the in boat position.
- * @param location the new in boat location
- */
- public void setInBoatPosition(Location location)
- {
- _inBoatPosition = location;
- }
-
/**
* Manage the delete task of a PlayerInstance (Leave Party, Unsummon pet, Save its inventory in the database, Remove it from the world...).
*
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/knownlist/PlayerKnownList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/knownlist/PlayerKnownList.java
index 2e2d89565e..5415dca8cc 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/knownlist/PlayerKnownList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/knownlist/PlayerKnownList.java
@@ -182,13 +182,12 @@ public class PlayerKnownList extends PlayableKnownList
activeChar.sendPacket(new CharInfo(otherPlayer));
final int relation = otherPlayer.getRelation(activeChar);
-
if ((otherPlayer.getKnownList().getKnownRelations().get(activeChar.getObjectId()) != null) && (otherPlayer.getKnownList().getKnownRelations().get(activeChar.getObjectId()) != relation))
{
activeChar.sendPacket(new RelationChanged(otherPlayer, relation, activeChar.isAutoAttackable(otherPlayer)));
}
- activeChar.sendPacket(new GetOnVehicle(otherPlayer, otherPlayer.getBoat(), otherPlayer.getInBoatPosition().getX(), otherPlayer.getInBoatPosition().getY(), otherPlayer.getInBoatPosition().getZ()));
+ activeChar.sendPacket(new GetOnVehicle(otherPlayer, otherPlayer.getBoat(), otherPlayer.getBoatPosition().getX(), otherPlayer.getBoatPosition().getY(), otherPlayer.getBoatPosition().getZ()));
}
else
@@ -196,7 +195,6 @@ public class PlayerKnownList extends PlayableKnownList
activeChar.sendPacket(new CharInfo(otherPlayer));
final int relation = otherPlayer.getRelation(activeChar);
-
if ((otherPlayer.getKnownList().getKnownRelations().get(activeChar.getObjectId()) != null) && (otherPlayer.getKnownList().getKnownRelations().get(activeChar.getObjectId()) != relation))
{
activeChar.sendPacket(new RelationChanged(otherPlayer, relation, activeChar.isAutoAttackable(otherPlayer)));
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
index 628976bb32..11ff00e47c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
@@ -52,7 +52,7 @@ public class CannotMoveAnymoreInVehicle extends GameClientPacket
if (player.isInBoat() && (player.getBoat().getObjectId() == _boatId))
{
- player.setInBoatPosition(new Location(_x, _y, _z));
+ player.setBoatPosition(new Location(_x, _y, _z));
player.getPosition().setHeading(_heading);
player.broadcastPacket(new StopMoveInVehicle(player, _boatId));
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
index 8826159363..99934bcc5e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -70,7 +70,6 @@ public class MoveBackwardToLocation extends GameClientPacket
protected void runImpl()
{
final PlayerInstance player = getClient().getPlayer();
-
if (player == null)
{
return;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
index 6a5d857b29..d131d32e12 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -16,8 +16,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import org.l2jmobius.gameserver.datatables.xml.BoatData;
-import org.l2jmobius.gameserver.model.actor.instance.BoatInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.serverpackets.GetOffVehicle;
@@ -49,7 +47,6 @@ public class RequestGetOffVehicle extends GameClientPacket
return;
}
- final BoatInstance boat = BoatData.getInstance().getBoat(_boatId);
- player.broadcastPacket(new GetOffVehicle(player, boat, _x, _y, _z));
+ player.broadcastPacket(new GetOffVehicle(player, _boatId, _x, _y, _z));
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
index 3c653e2134..f0fe68fc2d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -53,8 +53,8 @@ public class RequestGetOnVehicle extends GameClientPacket
return;
}
- player.setInBoatPosition(new Location(_x, _y, _z));
- player.getPosition().setXYZ(boat.getPosition().getX(), boat.getPosition().getY(), boat.getPosition().getZ());
+ player.setBoatPosition(new Location(_x, _y, _z));
+ player.setXYZ(boat.getPosition().getX(), boat.getPosition().getY(), boat.getPosition().getZ());
player.broadcastPacket(new GetOnVehicle(player, boat, _x, _y, _z));
player.revalidateZone(true);
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index ab76afb5ff..5e6f6dc10d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -50,18 +50,26 @@ public class RequestMoveToLocationInVehicle extends GameClientPacket
if (player.isAttackingNow() && (player.getActiveWeaponItem() != null) && (player.getActiveWeaponItem().getItemType() == WeaponType.BOW))
{
player.sendPacket(ActionFailed.STATIC_PACKET);
+ return;
+ }
+
+ BoatInstance boat;
+ if (player.isInBoat())
+ {
+ boat = player.getBoat();
+ if (boat.getObjectId() != _boatId)
+ {
+ boat = BoatData.getInstance().getBoat(_boatId);
+ player.setBoat(boat);
+ }
}
else
{
- final BoatInstance boat = BoatData.getInstance().getBoat(_boatId);
- if (boat == null)
- {
- return;
- }
+ boat = BoatData.getInstance().getBoat(_boatId);
player.setBoat(boat);
- player.setInBoat(true);
- player.setInBoatPosition(_targetPos);
- player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO_IN_A_BOAT, _targetPos, _originPos);
}
+
+ player.setBoatPosition(_targetPos);
+ player.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO_IN_A_BOAT, _targetPos, _originPos);
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
index 95bfa00971..2016749955 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -136,19 +136,16 @@ public class RequestRecordInfo extends GameClientPacket
otherPlayer.getPosition().setWorldPosition(otherPlayer.getBoat().getLocation());
player.sendPacket(new CharInfo(otherPlayer));
final int relation = otherPlayer.getRelation(player);
-
if ((otherPlayer.getKnownList().getKnownRelations().get(player.getObjectId()) != null) && (otherPlayer.getKnownList().getKnownRelations().get(player.getObjectId()) != relation))
{
player.sendPacket(new RelationChanged(otherPlayer, relation, player.isAutoAttackable(otherPlayer)));
}
-
- player.sendPacket(new GetOnVehicle(otherPlayer, otherPlayer.getBoat(), otherPlayer.getInBoatPosition().getX(), otherPlayer.getInBoatPosition().getY(), otherPlayer.getInBoatPosition().getZ()));
+ player.sendPacket(new GetOnVehicle(otherPlayer, otherPlayer.getBoat(), otherPlayer.getBoatPosition().getX(), otherPlayer.getBoatPosition().getY(), otherPlayer.getBoatPosition().getZ()));
}
else
{
player.sendPacket(new CharInfo(otherPlayer));
final int relation = otherPlayer.getRelation(player);
-
if ((otherPlayer.getKnownList().getKnownRelations().get(player.getObjectId()) != null) && (otherPlayer.getKnownList().getKnownRelations().get(player.getObjectId()) != relation))
{
player.sendPacket(new RelationChanged(otherPlayer, relation, player.isAutoAttackable(otherPlayer)));
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
index f9376b8bf9..ed9a8cac6b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
@@ -69,8 +69,8 @@ public class ValidatePosition extends GameClientPacket
{
if (Config.COORD_SYNCHRONIZE == 2)
{
- dx = _x - player.getInBoatPosition().getX();
- dy = _y - player.getInBoatPosition().getY();
+ dx = _x - player.getBoatPosition().getX();
+ dy = _y - player.getBoatPosition().getY();
// dz = _z - player.getInVehiclePosition().getZ();
diffSq = ((dx * dx) + (dy * dy));
if (diffSq > 250000)
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java
index b0d9a3b93f..5dac144bde 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java
@@ -16,7 +16,6 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
-import org.l2jmobius.gameserver.model.actor.instance.BoatInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
/**
@@ -24,49 +23,29 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
*/
public class GetOffVehicle extends GameServerPacket
{
+ private final PlayerInstance _player;
+ private final int _boatId;
private final int _x;
private final int _y;
private final int _z;
- private final PlayerInstance _player;
- private final BoatInstance _boat;
- /**
- * @param player
- * @param boat
- * @param x
- * @param y
- * @param z
- */
- public GetOffVehicle(PlayerInstance player, BoatInstance boat, int x, int y, int z)
+ public GetOffVehicle(PlayerInstance player, int boatId, int x, int y, int z)
{
_player = player;
- _boat = boat;
+ _boatId = boatId;
_x = x;
_y = y;
_z = z;
- if (_player != null)
- {
- _player.setInBoat(false);
- _player.setBoat(null);
- }
+ _player.setBoat(null);
}
- /*
- * (non-Javadoc)
- * @see org.l2jmobius.gameserver.serverpackets.ServerBasePacket#writeImpl()
- */
@Override
protected void writeImpl()
{
- if ((_boat == null) || (_player == null))
- {
- return;
- }
-
writeC(0x5d);
writeD(_player.getObjectId());
- writeD(_boat.getObjectId());
+ writeD(_boatId);
writeD(_x);
writeD(_y);
writeD(_z);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java
index c154a04723..3a26929ff4 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java
@@ -30,13 +30,6 @@ public class GetOnVehicle extends GameServerPacket
private final PlayerInstance _player;
private final BoatInstance _boat;
- /**
- * @param player
- * @param boat
- * @param x
- * @param y
- * @param z
- */
public GetOnVehicle(PlayerInstance player, BoatInstance boat, int x, int y, int z)
{
_player = player;
@@ -46,13 +39,8 @@ public class GetOnVehicle extends GameServerPacket
_z = z;
_player.setBoat(_boat);
- _player.setInBoat(true);
}
- /*
- * (non-Javadoc)
- * @see org.l2jmobius.gameserver.serverpackets.ServerBasePacket#writeImpl()
- */
@Override
protected void writeImpl()
{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java
index 57893142c6..ff9f8dc3a8 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java
@@ -30,11 +30,6 @@ public class MoveToLocationInVehicle extends GameServerPacket
private Location _destination;
private Location _origin;
- /**
- * @param actor
- * @param destination
- * @param origin
- */
public MoveToLocationInVehicle(Creature actor, Location destination, Location origin)
{
if (!(actor instanceof PlayerInstance))
@@ -43,7 +38,6 @@ public class MoveToLocationInVehicle extends GameServerPacket
}
final PlayerInstance player = (PlayerInstance) actor;
-
if (player.getBoat() == null)
{
return;
@@ -55,10 +49,6 @@ public class MoveToLocationInVehicle extends GameServerPacket
_origin = origin;
}
- /*
- * (non-Javadoc)
- * @see org.l2jmobius.gameserver.serverpackets.ServerBasePacket#writeImpl()
- */
@Override
protected void writeImpl()
{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java
index df57325bd8..266f6f09ae 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java
@@ -46,9 +46,9 @@ public class StopMoveInVehicle extends GameServerPacket
writeC(0x72);
writeD(_player.getObjectId());
writeD(_boatId);
- writeD(_player.getInBoatPosition().getX());
- writeD(_player.getInBoatPosition().getY());
- writeD(_player.getInBoatPosition().getZ());
+ writeD(_player.getBoatPosition().getX());
+ writeD(_player.getBoatPosition().getY());
+ writeD(_player.getBoatPosition().getZ());
writeD(_player.getPosition().getHeading());
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index d167700c12..22f3eb9859 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- player.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- player.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index d167700c12..22f3eb9859 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- player.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- player.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index c5f69a5fb6..3ffffec033 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index c5f69a5fb6..3ffffec033 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index c5f69a5fb6..3ffffec033 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index c5f69a5fb6..3ffffec033 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index c5f69a5fb6..3ffffec033 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index c5f69a5fb6..3ffffec033 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
index c5f69a5fb6..3ffffec033 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -100,24 +100,19 @@ public class RequestMoveToLocationInVehicle implements IClientIncomingPacket
return;
}
- final BoatInstance boat;
+ BoatInstance boat;
if (player.isInBoat())
{
boat = player.getBoat();
if (boat.getObjectId() != _boatId)
{
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
+ boat = BoatManager.getInstance().getBoat(_boatId);
+ player.setVehicle(boat);
}
}
else
{
boat = BoatManager.getInstance().getBoat(_boatId);
- if ((boat == null) || !boat.isInsideRadius3D(player, 300))
- {
- client.sendPacket(ActionFailed.STATIC_PACKET);
- return;
- }
player.setVehicle(boat);
}