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

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
Mac_Slash
2020-05-04 03:14:16 +02:00
parent 1937846fb2 f441f3ad6e
commit 3df82daf08
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReallifeGamemode.Server.Core/Managers/HouseManager.cs
View File

@@ -192,6 +192,7 @@ namespace ReallifeGamemode.Server.Core.Managers
.Include(h => h.Owner) .Include(h => h.Owner)
.Include(h => h.BankAccount) .Include(h => h.BankAccount)
.Include(h => h.Rentals) .Include(h => h.Rentals)
.ToList()
.OrderBy(h => h.Position.DistanceTo(position)) .OrderBy(h => h.Position.DistanceTo(position))
.FirstOrDefault(); .FirstOrDefault();
} }

4
ReallifeGamemode.Server/Managers/TuningManager.cs
View File

@@ -27,6 +27,8 @@ namespace ReallifeGamemode.Server.Managers
/// <param name="pos">Die Position der Garage</param> /// <param name="pos">Die Position der Garage</param>
public static void AddTuningGarage(Vector3 pos) public static void AddTuningGarage(Vector3 pos)
{ {
NAPI.Blip.CreateBlip(446, pos, 1f, 4, "Los Santos Customs", shortRange: true);
ColShape colShape = NAPI.ColShape.CreateSphereColShape(pos, 5, 0); ColShape colShape = NAPI.ColShape.CreateSphereColShape(pos, 5, 0);
colShape.OnEntityEnterColShape += (cs, c) => colShape.OnEntityEnterColShape += (cs, c) =>
@@ -35,7 +37,7 @@ namespace ReallifeGamemode.Server.Managers
if (c.IsInVehicle && c.VehicleSeat == 0) if (c.IsInVehicle && c.VehicleSeat == 0)
{ {
Vehicle v = c.Vehicle; Vehicle v = c.Vehicle;
if (v.GetServerVehicle() is FactionVehicle fV && fV.GetOwners().TrueForAll(fV => dbContext.Factions.Where(f => f.Id == fV).First().StateOwned)) if (v.GetServerVehicle() is FactionVehicle fV && fV.GetOwners().Any(fV => dbContext.Factions.Where(f => f.Id == fV && f.StateOwned).Any()))
{ {
return; return;
} }