"vehicleIsTryingToEnter" added (you have to test this with two people)

This commit is contained in:
EntenKoeniq 2021-11-19 10:44:16 +01:00
parent 1bcc9882c0
commit ffb3db7d37
2 changed files with 169 additions and 157 deletions

View File

@ -248,33 +248,11 @@ namespace CoopClient
byte? flags; byte? flags;
if (!player.IsInVehicle()) Vehicle vehicleTryingToEnter = null;
{
flags = player.GetPedFlags(fullSync, true);
DebugSyncPed.Rotation = player.Rotation; if (player.IsInVehicle() || (vehicleTryingToEnter = player.VehicleTryingToEnter) != null)
DebugSyncPed.Velocity = player.Velocity;
DebugSyncPed.Speed = player.GetPedSpeed();
DebugSyncPed.AimCoords = player.GetPedAimCoords(false);
DebugSyncPed.CurrentWeaponHash = (int)player.Weapons.Current.Hash;
DebugSyncPed.LastSyncWasFull = (flags.Value & (byte)PedDataFlags.LastSyncWasFull) > 0;
DebugSyncPed.IsAiming = (flags.Value & (byte)PedDataFlags.IsAiming) > 0;
DebugSyncPed.IsShooting = (flags.Value & (byte)PedDataFlags.IsShooting) > 0;
DebugSyncPed.IsReloading = (flags.Value & (byte)PedDataFlags.IsReloading) > 0;
DebugSyncPed.IsJumping = (flags.Value & (byte)PedDataFlags.IsJumping) > 0;
DebugSyncPed.IsRagdoll = (flags.Value & (byte)PedDataFlags.IsRagdoll) > 0;
DebugSyncPed.IsOnFire = (flags.Value & (byte)PedDataFlags.IsOnFire) > 0;
DebugSyncPed.IsInVehicle = false;
if (DebugSyncPed.Character != null && DebugSyncPed.Character.Exists())
{ {
Function.Call(Hash.SET_ENTITY_NO_COLLISION_ENTITY, DebugSyncPed.Character.Handle, player.Handle, false); Vehicle veh = player.CurrentVehicle ?? vehicleTryingToEnter;
Function.Call(Hash.SET_ENTITY_NO_COLLISION_ENTITY, player.Handle, DebugSyncPed.Character.Handle, false);
}
}
else
{
Vehicle veh = player.CurrentVehicle;
veh.Opacity = 75; veh.Opacity = 75;
flags = veh.GetVehicleFlags(fullSync); flags = veh.GetVehicleFlags(fullSync);
@ -309,8 +287,32 @@ namespace CoopClient
if (DebugSyncPed.MainVehicle != null && DebugSyncPed.MainVehicle.Exists() && player.IsInVehicle()) if (DebugSyncPed.MainVehicle != null && DebugSyncPed.MainVehicle.Exists() && player.IsInVehicle())
{ {
Function.Call(Hash.SET_ENTITY_NO_COLLISION_ENTITY, DebugSyncPed.MainVehicle.Handle, player.CurrentVehicle.Handle, false); Function.Call(Hash.SET_ENTITY_NO_COLLISION_ENTITY, DebugSyncPed.MainVehicle.Handle, veh.Handle, false);
Function.Call(Hash.SET_ENTITY_NO_COLLISION_ENTITY, player.CurrentVehicle.Handle, DebugSyncPed.MainVehicle.Handle, false); Function.Call(Hash.SET_ENTITY_NO_COLLISION_ENTITY, veh.Handle, DebugSyncPed.MainVehicle.Handle, false);
}
}
else
{
flags = player.GetPedFlags(fullSync, true);
DebugSyncPed.Rotation = player.Rotation;
DebugSyncPed.Velocity = player.Velocity;
DebugSyncPed.Speed = player.GetPedSpeed();
DebugSyncPed.AimCoords = player.GetPedAimCoords(false);
DebugSyncPed.CurrentWeaponHash = (int)player.Weapons.Current.Hash;
DebugSyncPed.LastSyncWasFull = (flags.Value & (byte)PedDataFlags.LastSyncWasFull) > 0;
DebugSyncPed.IsAiming = (flags.Value & (byte)PedDataFlags.IsAiming) > 0;
DebugSyncPed.IsShooting = (flags.Value & (byte)PedDataFlags.IsShooting) > 0;
DebugSyncPed.IsReloading = (flags.Value & (byte)PedDataFlags.IsReloading) > 0;
DebugSyncPed.IsJumping = (flags.Value & (byte)PedDataFlags.IsJumping) > 0;
DebugSyncPed.IsRagdoll = (flags.Value & (byte)PedDataFlags.IsRagdoll) > 0;
DebugSyncPed.IsOnFire = (flags.Value & (byte)PedDataFlags.IsOnFire) > 0;
DebugSyncPed.IsInVehicle = false;
if (DebugSyncPed.Character != null && DebugSyncPed.Character.Exists())
{
Function.Call(Hash.SET_ENTITY_NO_COLLISION_ENTITY, DebugSyncPed.Character.Handle, player.Handle, false);
Function.Call(Hash.SET_ENTITY_NO_COLLISION_ENTITY, player.Handle, DebugSyncPed.Character.Handle, false);
} }
} }

View File

@ -594,7 +594,73 @@ namespace CoopClient
{ {
messageType = NetDeliveryMethod.UnreliableSequenced; messageType = NetDeliveryMethod.UnreliableSequenced;
if (!player.IsInVehicle()) Vehicle vehicleIsTryingToEnter = null;
if (player.IsInVehicle() || (vehicleIsTryingToEnter = player.VehicleTryingToEnter) != null)
{
Vehicle veh = player.CurrentVehicle ?? vehicleIsTryingToEnter;
LVector3 vehPosition = new LVector3();
LQuaternion vehRotation = new LQuaternion();
float vehEngineHealth = 0f;
float vehRPM = 0f;
LVector3 vehVelocity = new LVector3();
float vehSpeed = 0f;
float vehSteeringAngle = 0f;
Dictionary<int, int> vehMods = null;
VehicleDoors[] vehDoors = null;
int vehTires = 0;
int primaryColor = 0;
int secondaryColor = 0;
if (veh.GetResponsiblePedHandle() == player.Handle)
{
vehPosition = veh.Position.ToLVector();
vehRotation = veh.Quaternion.ToLQuaternion();
vehEngineHealth = veh.EngineHealth;
vehRPM = veh.CurrentRPM;
vehVelocity = veh.Velocity.ToLVector();
vehSpeed = veh.Speed;
vehSteeringAngle = veh.SteeringAngle;
vehMods = veh.Mods.GetVehicleMods();
vehDoors = veh.Doors.GetVehicleDoors();
vehTires = veh.Wheels.GetBrokenTires();
unsafe
{
Function.Call<int>(Hash.GET_VEHICLE_COLOURS, veh, &primaryColor, &secondaryColor);
}
}
new FullSyncPlayerVehPacket()
{
Extra = new PlayerPacket()
{
ID = Main.LocalClientID,
Health = player.Health,
Position = player.Position.ToLVector()
},
ModelHash = player.Model.Hash,
Props = player.GetPedProps(),
VehModelHash = veh.Model.Hash,
VehSeatIndex = (int)player.SeatIndex,
VehPosition = vehPosition,
VehRotation = vehRotation,
VehEngineHealth = vehEngineHealth,
VehRPM = vehRPM,
VehVelocity = vehVelocity,
VehSpeed = vehSpeed,
VehSteeringAngle = vehSteeringAngle,
VehColors = new int[] { primaryColor, secondaryColor },
VehMods = vehMods,
VehDoors = vehDoors,
VehTires = vehTires,
Flag = veh.GetVehicleFlags(true)
}.PacketToNetOutGoingMessage(outgoingMessage);
}
else
{ {
new FullSyncPlayerPacket() new FullSyncPlayerPacket()
{ {
@ -614,68 +680,6 @@ namespace CoopClient
Flag = player.GetPedFlags(true, true) Flag = player.GetPedFlags(true, true)
}.PacketToNetOutGoingMessage(outgoingMessage); }.PacketToNetOutGoingMessage(outgoingMessage);
} }
else
{
LVector3 vehPosition = new LVector3();
LQuaternion vehRotation = new LQuaternion();
float vehEngineHealth = 0f;
float vehRPM = 0f;
LVector3 vehVelocity = new LVector3();
float vehSpeed = 0f;
float vehSteeringAngle = 0f;
Dictionary<int, int> vehMods = null;
VehicleDoors[] vehDoors = null;
int vehTires = 0;
int primaryColor = 0;
int secondaryColor = 0;
if (player.CurrentVehicle.GetResponsiblePedHandle() == player.Handle)
{
vehPosition = player.CurrentVehicle.Position.ToLVector();
vehRotation = player.CurrentVehicle.Quaternion.ToLQuaternion();
vehEngineHealth = player.CurrentVehicle.EngineHealth;
vehRPM = player.CurrentVehicle.CurrentRPM;
vehVelocity = player.CurrentVehicle.Velocity.ToLVector();
vehSpeed = player.CurrentVehicle.Speed;
vehSteeringAngle = player.CurrentVehicle.SteeringAngle;
vehMods = player.CurrentVehicle.Mods.GetVehicleMods();
vehDoors = player.CurrentVehicle.Doors.GetVehicleDoors();
vehTires = player.CurrentVehicle.Wheels.GetBrokenTires();
unsafe
{
Function.Call<int>(Hash.GET_VEHICLE_COLOURS, player.CurrentVehicle, &primaryColor, &secondaryColor);
}
}
new FullSyncPlayerVehPacket()
{
Extra = new PlayerPacket()
{
ID = Main.LocalClientID,
Health = player.Health,
Position = player.Position.ToLVector()
},
ModelHash = player.Model.Hash,
Props = player.GetPedProps(),
VehModelHash = player.CurrentVehicle.Model.Hash,
VehSeatIndex = (int)player.SeatIndex,
VehPosition = vehPosition,
VehRotation = vehRotation,
VehEngineHealth = vehEngineHealth,
VehRPM = vehRPM,
VehVelocity = vehVelocity,
VehSpeed = vehSpeed,
VehSteeringAngle = vehSteeringAngle,
VehColors = new int[] { primaryColor, secondaryColor },
VehMods = vehMods,
VehDoors = vehDoors,
VehTires = vehTires,
Flag = player.CurrentVehicle.GetVehicleFlags(true)
}.PacketToNetOutGoingMessage(outgoingMessage);
}
LastPlayerFullSync = Environment.TickCount; LastPlayerFullSync = Environment.TickCount;
} }
@ -683,7 +687,44 @@ namespace CoopClient
{ {
messageType = NetDeliveryMethod.ReliableSequenced; messageType = NetDeliveryMethod.ReliableSequenced;
if (!player.IsInVehicle()) if (player.IsInVehicle())
{
Vehicle veh = player.CurrentVehicle;
LVector3 vehPosition = new LVector3();
LQuaternion vehRotation = new LQuaternion();
LVector3 vehVelocity = new LVector3();
float vehSpeed = 0f;
float vehSteeringAngle = 0f;
if (veh.GetResponsiblePedHandle() == player.Handle)
{
vehPosition = veh.Position.ToLVector();
vehRotation = veh.Quaternion.ToLQuaternion();
vehVelocity = veh.Velocity.ToLVector();
vehSpeed = veh.Speed;
vehSteeringAngle = veh.SteeringAngle;
}
new LightSyncPlayerVehPacket()
{
Extra = new PlayerPacket()
{
ID = Main.LocalClientID,
Health = player.Health,
Position = player.Position.ToLVector()
},
VehModelHash = veh.Model.Hash,
VehSeatIndex = (int)player.SeatIndex,
VehPosition = vehPosition,
VehRotation = vehRotation,
VehVelocity = vehVelocity,
VehSpeed = vehSpeed,
VehSteeringAngle = vehSteeringAngle,
Flag = veh.GetVehicleFlags(false)
}.PacketToNetOutGoingMessage(outgoingMessage);
}
else
{ {
new LightSyncPlayerPacket() new LightSyncPlayerPacket()
{ {
@ -701,41 +742,6 @@ namespace CoopClient
Flag = player.GetPedFlags(false, true) Flag = player.GetPedFlags(false, true)
}.PacketToNetOutGoingMessage(outgoingMessage); }.PacketToNetOutGoingMessage(outgoingMessage);
} }
else
{
LVector3 vehPosition = new LVector3();
LQuaternion vehRotation = new LQuaternion();
LVector3 vehVelocity = new LVector3();
float vehSpeed = 0f;
float vehSteeringAngle = 0f;
if (player.CurrentVehicle.GetResponsiblePedHandle() == player.Handle)
{
vehPosition = player.CurrentVehicle.Position.ToLVector();
vehRotation = player.CurrentVehicle.Quaternion.ToLQuaternion();
vehVelocity = player.CurrentVehicle.Velocity.ToLVector();
vehSpeed = player.CurrentVehicle.Speed;
vehSteeringAngle = player.CurrentVehicle.SteeringAngle;
}
new LightSyncPlayerVehPacket()
{
Extra = new PlayerPacket()
{
ID = Main.LocalClientID,
Health = player.Health,
Position = player.Position.ToLVector()
},
VehModelHash = player.CurrentVehicle.Model.Hash,
VehSeatIndex = (int)player.SeatIndex,
VehPosition = vehPosition,
VehRotation = vehRotation,
VehVelocity = vehVelocity,
VehSpeed = vehSpeed,
VehSteeringAngle = vehSteeringAngle,
Flag = player.CurrentVehicle.GetVehicleFlags(false)
}.PacketToNetOutGoingMessage(outgoingMessage);
}
} }
Client.SendMessage(outgoingMessage, messageType); Client.SendMessage(outgoingMessage, messageType);
@ -753,25 +759,12 @@ namespace CoopClient
{ {
NetOutgoingMessage outgoingMessage = Client.CreateMessage(); NetOutgoingMessage outgoingMessage = Client.CreateMessage();
if (!npc.IsInVehicle()) Vehicle vehicleTryingToEnter = null;
{
new FullSyncNpcPacket() if (npc.IsInVehicle() || (vehicleTryingToEnter = npc.VehicleTryingToEnter) != null)
{
ID = Main.LocalClientID + npc.Handle,
ModelHash = npc.Model.Hash,
Props = npc.GetPedProps(),
Health = npc.Health,
Position = npc.Position.ToLVector(),
Rotation = npc.Rotation.ToLVector(),
Velocity = npc.Velocity.ToLVector(),
Speed = npc.GetPedSpeed(),
AimCoords = npc.GetPedAimCoords(true).ToLVector(),
CurrentWeaponHash = (int)npc.Weapons.Current.Hash,
Flag = npc.GetPedFlags(true)
}.PacketToNetOutGoingMessage(outgoingMessage);
}
else
{ {
Vehicle veh = npc.CurrentVehicle ?? vehicleTryingToEnter;
LVector3 vehPosition = new LVector3(); LVector3 vehPosition = new LVector3();
LQuaternion vehRotation = new LQuaternion(); LQuaternion vehRotation = new LQuaternion();
float vehEngineHealth = 0f; float vehEngineHealth = 0f;
@ -787,19 +780,19 @@ namespace CoopClient
int primaryColor = 0; int primaryColor = 0;
int secondaryColor = 0; int secondaryColor = 0;
if (npc.CurrentVehicle.GetResponsiblePedHandle() == npc.Handle) if (veh.GetResponsiblePedHandle() == npc.Handle)
{ {
vehPosition = npc.CurrentVehicle.Position.ToLVector(); vehPosition = veh.Position.ToLVector();
vehRotation = npc.CurrentVehicle.Quaternion.ToLQuaternion(); vehRotation = veh.Quaternion.ToLQuaternion();
vehEngineHealth = npc.CurrentVehicle.EngineHealth; vehEngineHealth = veh.EngineHealth;
vehRPM = npc.CurrentVehicle.CurrentRPM; vehRPM = veh.CurrentRPM;
vehVelocity = npc.CurrentVehicle.Velocity.ToLVector(); vehVelocity = veh.Velocity.ToLVector();
vehSpeed = npc.CurrentVehicle.Speed; vehSpeed = veh.Speed;
vehSteeringAngle = npc.CurrentVehicle.SteeringAngle; vehSteeringAngle = veh.SteeringAngle;
vehMods = npc.CurrentVehicle.Mods.GetVehicleMods(); vehMods = veh.Mods.GetVehicleMods();
vehDoors = npc.CurrentVehicle.Doors.GetVehicleDoors(); vehDoors = veh.Doors.GetVehicleDoors();
vehTires = npc.CurrentVehicle.Wheels.GetBrokenTires(); vehTires = veh.Wheels.GetBrokenTires();
unsafe unsafe
{ {
@ -814,7 +807,7 @@ namespace CoopClient
Props = npc.GetPedProps(), Props = npc.GetPedProps(),
Health = npc.Health, Health = npc.Health,
Position = npc.Position.ToLVector(), Position = npc.Position.ToLVector(),
VehModelHash = npc.CurrentVehicle.Model.Hash, VehModelHash = veh.Model.Hash,
VehSeatIndex = (int)npc.SeatIndex, VehSeatIndex = (int)npc.SeatIndex,
VehPosition = vehPosition, VehPosition = vehPosition,
VehRotation = vehRotation, VehRotation = vehRotation,
@ -827,7 +820,24 @@ namespace CoopClient
VehMods = vehMods, VehMods = vehMods,
VehDoors = vehDoors, VehDoors = vehDoors,
VehTires = vehTires, VehTires = vehTires,
Flag = npc.CurrentVehicle.GetVehicleFlags(true) Flag = veh.GetVehicleFlags(true)
}.PacketToNetOutGoingMessage(outgoingMessage);
}
else
{
new FullSyncNpcPacket()
{
ID = Main.LocalClientID + npc.Handle,
ModelHash = npc.Model.Hash,
Props = npc.GetPedProps(),
Health = npc.Health,
Position = npc.Position.ToLVector(),
Rotation = npc.Rotation.ToLVector(),
Velocity = npc.Velocity.ToLVector(),
Speed = npc.GetPedSpeed(),
AimCoords = npc.GetPedAimCoords(true).ToLVector(),
CurrentWeaponHash = (int)npc.Weapons.Current.Hash,
Flag = npc.GetPedFlags(true)
}.PacketToNetOutGoingMessage(outgoingMessage); }.PacketToNetOutGoingMessage(outgoingMessage);
} }