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

diverse fixes und improvments

Browse Source
This commit is contained in:
hydrant
2021-05-27 21:41:24 +02:00
parent 5884ee50d9
commit 1dea6bc28d
4 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -887,7 +887,7 @@ namespace ReallifeGamemode.Server.Managers
"pounder2"
};
public VehicleManager ()
public VehicleManager()
{
#region add_VehicleRespawnPoints
VehicleRespawnPoints.Add(pos1);
@@ -1114,30 +1114,24 @@ namespace ReallifeGamemode.Server.Managers
vehicle.Delete();
return;
}
InventoryManager.RemoveAllItemsfromVehicleInventory(vehicle);
CheckVehicleDeath(vehicle.Id);
}
public static void CheckVehicleDeath(int id)
{
using (var dbContext = new DatabaseContext())
{
Vehicle vehicle = NAPI.Pools.GetAllVehicles().Find(v => v.Id == id);
ServerVehicle sV = vehicle.GetServerVehicle(dbContext);
if (sV is UserVehicle)
if (sV is UserVehicle uV)
{
foreach (VehicleRespawnPoint point in VehicleRespawnPoints)
{
if (NAPI.Pools.GetAllVehicles().Any(v => v.Position.DistanceTo(point.Position) < 1))
{
ChatService.Broadcast("Fahrzeug zu nah");
}
else
if (!NAPI.Pools.GetAllVehicles().Any(v => v.Position.DistanceTo(point.Position) < 1))
{
sV.PositionX = point.Position.X;
sV.PositionY = point.Position.Y;
@@ -1147,17 +1141,20 @@ namespace ReallifeGamemode.Server.Managers
break;
}
}
User user = dbContext.Users.Find(uV.UserId);
user.Player?.SendNotification("Dein Fahrzeug ist zerstört~n~Du kannst es im Interaktionsmenü unter \"Fahrzeuge\" orten");
vehicle.Delete();
Vehicle newVeh = sV.Spawn(vehicle);
newVeh.Repair();
}
if (sV is FactionVehicle || sV is GroupVehicle)
{
vehicle.Delete();
Vehicle newVeh = sV.Spawn(vehicle);
newVeh.Repair();
}
InventoryManager.RemoveAllItemsfromVehicleInventory(vehicle);
}
}
@@ -1171,26 +1168,26 @@ namespace ReallifeGamemode.Server.Managers
}
#region spawnpositions-vehicleInWater
public static List<VehicleRespawnPoint> VehicleRespawnPoints = new List<VehicleRespawnPoint> ();
public static List<VehicleRespawnPoint> VehicleRespawnPoints = new List<VehicleRespawnPoint>();
VehicleRespawnPoint pos1 = new VehicleRespawnPoint()
{
{
Position = new Vector3(-307.84, -909.04, 31.07),
Heading = 167.46f
};
VehicleRespawnPoint pos2 = new VehicleRespawnPoint()
{
Position = new Vector3(-311.52, -908.40, 31.07),
Position = new Vector3(-311.52, -908.40, 31.07),
Heading = 170.40f
};
VehicleRespawnPoint pos3 = new VehicleRespawnPoint()
{
Position = new Vector3(-315.18, -907.68, 31.07),
Position = new Vector3(-315.18, -907.68, 31.07),
Heading = 167.17f
};
VehicleRespawnPoint pos4 = new VehicleRespawnPoint()
{
Position = new Vector3(-319.09, -906.68, 31.07),
Position = new Vector3(-319.09, -906.68, 31.07),
Heading = 168.41f
};
VehicleRespawnPoint pos5 = new VehicleRespawnPoint()
@@ -1205,27 +1202,27 @@ namespace ReallifeGamemode.Server.Managers
};
VehicleRespawnPoint pos7 = new VehicleRespawnPoint()
{
Position = new Vector3(-325.95, -905.17, 31.07),
Position = new Vector3(-325.95, -905.17, 31.07),
Heading = 168.26f
};
VehicleRespawnPoint pos8 = new VehicleRespawnPoint()
{
Position = new Vector3(-329.77, -904.33, 31.07),
Position = new Vector3(-329.77, -904.33, 31.07),
Heading = 168.17f
};
VehicleRespawnPoint pos9 = new VehicleRespawnPoint()
{
Position = new Vector3(-333.31, -903.61, 31.07),
Position = new Vector3(-333.31, -903.61, 31.07),
Heading = 169.17f
};
};
VehicleRespawnPoint pos10 = new VehicleRespawnPoint()
{
Position = new Vector3(-336.86, -902.80, 31.07),
Position = new Vector3(-336.86, -902.80, 31.07),
Heading = 167.65f
};
VehicleRespawnPoint pos11 = new VehicleRespawnPoint()
{
Position = new Vector3(-340.41, -902.12, 31.07),
Position = new Vector3(-340.41, -902.12, 31.07),
Heading = 162.65f
};
VehicleRespawnPoint pos12 = new VehicleRespawnPoint()
@@ -1266,7 +1263,7 @@ namespace ReallifeGamemode.Server.Managers
VehicleRespawnPoint pos19 = new VehicleRespawnPoint()
{
Position = new Vector3(-346.58, -973.31, 31.08),
Heading = -19.79f
Heading = -19.79f
};
VehicleRespawnPoint pos20 = new VehicleRespawnPoint()
{