aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes vehiclesInWater

Browse Source
This commit is contained in:
michael.reiswich
2021-05-18 00:13:14 +02:00
parent 869235a819
commit 1e623f8fa9
2 changed files with 52 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ReallifeGamemode.Client/vehiclesync/vehicleinwater.ts
View File

@@ -2,10 +2,8 @@
mp.events.add('CheckWaterCrash', (vehicle) => {
if (!vehicle.isInWater() && vehicle.getIsEngineRunning()) {
return;
if (vehicle.isInWater() && !vehicle.getIsEngineRunning()) {
mp.events.callRemote("CheckWater", vehicle.id);
}
mp.gui.chat.push("Das Auto ist im Wasser");
mp.events.callRemote("CheckWater", vehicle.id);
});
}

104
ReallifeGamemode.Server/Managers/VehicleManager.cs
View File

@@ -3,7 +3,6 @@ using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Core.API;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Log;
using ReallifeGamemode.Server.Services;
@@ -888,6 +887,32 @@ namespace ReallifeGamemode.Server.Managers
"pounder2"
};
public VehicleManager ()
{
#region add_VehicleRespawnPoints
VehicleRespawnPoints.Add(pos1);
VehicleRespawnPoints.Add(pos2);
VehicleRespawnPoints.Add(pos3);
VehicleRespawnPoints.Add(pos4);
VehicleRespawnPoints.Add(pos5);
VehicleRespawnPoints.Add(pos6);
VehicleRespawnPoints.Add(pos7);
VehicleRespawnPoints.Add(pos8);
VehicleRespawnPoints.Add(pos9);
VehicleRespawnPoints.Add(pos10);
VehicleRespawnPoints.Add(pos11);
VehicleRespawnPoints.Add(pos12);
VehicleRespawnPoints.Add(pos13);
VehicleRespawnPoints.Add(pos14);
VehicleRespawnPoints.Add(pos15);
VehicleRespawnPoints.Add(pos16);
VehicleRespawnPoints.Add(pos17);
VehicleRespawnPoints.Add(pos18);
VehicleRespawnPoints.Add(pos19);
VehicleRespawnPoints.Add(pos20);
#endregion add_VehicleRespawnPoints
}
private static readonly Dictionary<int, ushort> _serverVehicles = new Dictionary<int, ushort>();
private static readonly Dictionary<NetHandle, Vector3> lastPositions = new Dictionary<NetHandle, Vector3>();
@@ -1109,101 +1134,102 @@ namespace ReallifeGamemode.Server.Managers
VehicleRespawnPoint pos1 = new VehicleRespawnPoint()
{
Position = new Vector3(-307.84, -909.04, 31.07),
heading = 167.46f
Heading = 167.46f
};
VehicleRespawnPoint pos2 = new VehicleRespawnPoint()
{
Position = new Vector3(-311.52, -908.40, 31.07),
heading = 170.40f
Heading = 170.40f
};
VehicleRespawnPoint pos3 = new VehicleRespawnPoint()
{
Position = new Vector3(-315.18, -907.68, 31.07),
heading = 167.17f
Heading = 167.17f
};
VehicleRespawnPoint pos4 = new VehicleRespawnPoint()
{
Position = new Vector3(-319.09, -906.68, 31.07),
heading = 168.41f
Heading = 168.41f
};
VehicleRespawnPoint pos5 = new VehicleRespawnPoint()
{
Position = new Vector3(-322.48, -905.95, 31.07),
heading = 169.00f
Heading = 169.00f
};
VehicleRespawnPoint pos6 = new VehicleRespawnPoint()
{
Position = new Vector3(-322.48, -905.95, 31.07),
heading = 169.00f
Heading = 169.00f
};
VehicleRespawnPoint pos7 = new VehicleRespawnPoint()
{
Position = new Vector3(-325.95, -905.17, 31.07),
heading = 168.26f
Heading = 168.26f
};
VehicleRespawnPoint pos8 = new VehicleRespawnPoint()
{
Position = new Vector3(-329.77, -904.33, 31.07),
heading = 168.17f
Heading = 168.17f
};
VehicleRespawnPoint pos9 = new VehicleRespawnPoint()
{
Position = new Vector3(-333.31, -903.61, 31.07),
heading = 169.17f
Heading = 169.17f
};
VehicleRespawnPoint pos10 = new VehicleRespawnPoint()
{
Position = new Vector3(-336.86, -902.80, 31.07),
heading = 167.65f
Heading = 167.65f
};
VehicleRespawnPoint pos11 = new VehicleRespawnPoint()
{
Position = new Vector3(-340.41, -902.12, 31.07),
heading = 162.65f
Heading = 162.65f
};
VehicleRespawnPoint pos12 = new VehicleRespawnPoint()
{
Position = new Vector3(-360.96, -893.13, 31.07),
heading = -88.49f
Heading = -88.49f
};
VehicleRespawnPoint pos13 = new VehicleRespawnPoint()
{
Position = new Vector3(-360.80, -896.62, 31.07),
heading = -88.13f
Heading = -88.13f
};
VehicleRespawnPoint pos14 = new VehicleRespawnPoint()
{
Position = new Vector3(-359.50, -944.78, 31.08),
heading = -89.30f
Heading = -89.30f
};
VehicleRespawnPoint pos15 = new VehicleRespawnPoint()
{
Position = new Vector3(-361.17, -948.58, 31.08),
heading = -85.58f
Heading = -85.58f
};
VehicleRespawnPoint pos16 = new VehicleRespawnPoint()
{
Position = new Vector3(-361.00, -952.27, 31.08),
heading = -89.86f
Heading = -89.86f
};
VehicleRespawnPoint pos17 = new VehicleRespawnPoint()
{
Position = new Vector3(-360.99, -955.92, 31.08),
heading = -87.21f
Heading = -87.21f
};
VehicleRespawnPoint pos18 = new VehicleRespawnPoint()
{
Position = new Vector3(-350.26, -972.01, 31.08),
heading = -18.13f
Heading = -18.13f
};
VehicleRespawnPoint pos19 = new VehicleRespawnPoint()
{
Position = new Vector3(-346.58, -973.31, 31.08),
Heading = -19.79f
};
VehicleRespawnPoint pos20 = new VehicleRespawnPoint()
{
Position = new Vector3(-343.31, -974.59, 31.08),
heading = -20.22f
Heading = -20.22f
};
/*
private readonly IReadOnlyCollection<Vector3> vector3s = new List<Vector3>
@@ -1255,28 +1281,7 @@ namespace ReallifeGamemode.Server.Managers
[RemoteEvent("CheckWater")]
public void CheckWater(Player player, int id)
{
#region add_VehicleRespawnPoints
VehicleRespawnPoints.Add(pos1);
VehicleRespawnPoints.Add(pos2);
VehicleRespawnPoints.Add(pos3);
VehicleRespawnPoints.Add(pos4);
VehicleRespawnPoints.Add(pos5);
VehicleRespawnPoints.Add(pos6);
VehicleRespawnPoints.Add(pos7);
VehicleRespawnPoints.Add(pos8);
VehicleRespawnPoints.Add(pos9);
VehicleRespawnPoints.Add(pos10);
VehicleRespawnPoints.Add(pos11);
VehicleRespawnPoints.Add(pos12);
VehicleRespawnPoints.Add(pos13);
VehicleRespawnPoints.Add(pos14);
VehicleRespawnPoints.Add(pos15);
VehicleRespawnPoints.Add(pos16);
VehicleRespawnPoints.Add(pos17);
VehicleRespawnPoints.Add(pos18);
VehicleRespawnPoints.Add(pos19);
VehicleRespawnPoints.Add(pos20);
#endregion add_VehicleRespawnPoints
using (var dbContext = new DatabaseContext())
{
@@ -1298,22 +1303,14 @@ namespace ReallifeGamemode.Server.Managers
sV.PositionX = point.Position.X;
sV.PositionY = point.Position.Y;
sV.PositionZ = point.Position.Z;
sV.Heading = point.heading;
sV.Heading = point.Heading;
dbContext.SaveChanges();
break;
}
}
/* Vector3 pos = new Vector3(-344.02, -928.72, 31.08);
sV.PositionX = pos.X;
sV.PositionY = pos.Y;
sV.PositionZ = pos.Z;
sV.Heading = -109;
dbContext.SaveChanges(); */
vehicle.Delete();
Vehicle newVeh = sV.Spawn(vehicle);
newVeh.Repair();
newVeh.Rotation = new Vector3(0, 0, sV.Heading);
}
if (sV is FactionVehicle || sV is GroupVehicle)
@@ -1321,7 +1318,6 @@ namespace ReallifeGamemode.Server.Managers
vehicle.Delete();
Vehicle newVeh = sV.Spawn(vehicle);
newVeh.Repair();
newVeh.Rotation = new Vector3(0, 0, sV.Heading);
}
}
}
@@ -1330,5 +1326,5 @@ namespace ReallifeGamemode.Server.Managers
public class VehicleRespawnPoint
{
public Vector3 Position { get; set; }
public float heading { get; set; }
public float Heading { get; set; }
}