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

MfG, DimGamer

Browse Source
This commit is contained in:
hydrant
2020-03-25 21:33:32 +01:00
parent 16be2869a0
commit 0d8249c39c
16 changed files with 1527 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ReallifeGamemode.Server/Events/EnterVehicle.cs
View File

@@ -18,7 +18,8 @@ namespace ReallifeGamemode.Server.Events
return;
if (vehicle.GetServerVehicle() is FactionVehicle veh)
{
if (client.GetUser().FactionId != null && (veh.FactionId == client.GetUser().FactionId) && (veh.Model == VehicleHash.Burrito3) && vehicle.HasData("weaponDeal") && vehicle.GetData<bool>("weaponDeal") == true)
User u = client.GetUser();
if (u.FactionId != null && (!veh.GetOwners().Contains(u.FactionId.Value)) && (veh.Model == VehicleHash.Burrito3) && vehicle.HasData("weaponDeal") && vehicle.GetData<bool>("weaponDeal") == true)
{
Vector3 vector = WeaponDealPoints.getRndWD_Route(client.GetUser().FactionId.Value);
if (vector == new Vector3())

5
ReallifeGamemode.Server/Events/EnterVehicleAttempt.cs
View File

@@ -4,6 +4,7 @@ using System.Text;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.WeaponDeal;
namespace ReallifeGamemode.Server.Events
@@ -22,9 +23,11 @@ namespace ReallifeGamemode.Server.Events
if (seat != 0) return;
User u = player.GetUser();
if (vehicle.GetServerVehicle() is FactionVehicle veh)
{
if (veh.FactionId != player.GetUser().FactionId)
if (!veh.GetOwners().Contains(player.GetUser().FactionId ?? 0) && !u.IsAdmin(AdminLevel.HEADADMIN))
{
if ((VehicleHash)vehicle.Model == VehicleHash.Burrito3)
{

3
ReallifeGamemode.Server/Events/ExitVehicle.cs
View File

@@ -19,7 +19,8 @@ namespace ReallifeGamemode.Server.Events
return;
if (vehicle.GetServerVehicle() is FactionVehicle veh)
{
if ((client.GetUser().FactionId != null) && (veh.FactionId == client.GetUser().FactionId) && ((VehicleHash)vehicle.Model == VehicleHash.Burrito3) && vehicle.HasData("weaponDeal") && vehicle.GetData<bool>("weaponDeal") == true)
User u = client.GetUser();
if ((u.FactionId != null) && (veh.GetOwners().Contains(u.FactionId ?? 0)) && ((VehicleHash)vehicle.Model == VehicleHash.Burrito3) && vehicle.HasData("weaponDeal") && vehicle.GetData<bool>("weaponDeal") == true)
{
CheckPointHandle.RemovePlayerHandlerFromList(client);
client.TriggerEvent("destroyCP");

5
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -453,7 +453,7 @@ namespace ReallifeGamemode.Server.Events
}
else if (sV is FactionVehicle fV)
{
if (fV.FactionId != u.FactionId && !state && !u.IsAdmin(AdminLevel.ADMIN3))
if (!fV.GetOwners().Contains(u.FactionId ?? 0) && !state && !u.IsAdmin(AdminLevel.ADMIN3))
{
player.SendNotification("~r~Du hast keinen Schlüssel.");
return;
@@ -509,7 +509,8 @@ namespace ReallifeGamemode.Server.Events
ServerVehicle veh = player.Vehicle.GetServerVehicle();
if (veh != null)
{
if (veh is FactionVehicle fV && fV.FactionId != player.GetUser()?.FactionId && (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? false))
User u = player.GetUser();
if (veh is FactionVehicle fV && !fV.GetOwners().Contains(u.FactionId ?? 0) && (!u.IsAdmin(AdminLevel.ADMIN3)))
{
return;
}

8
ReallifeGamemode.Server/Events/Vehicle.cs
View File

@@ -38,7 +38,7 @@ namespace ReallifeGamemode.Server.Events
}
else if (sV is FactionVehicle fV)
{
if (fV.FactionId != u.FactionId && !state && !u.IsAdmin(AdminLevel.ADMIN3))
if (!fV.GetOwners().Contains(u.FactionId ?? 0) && !state && !u.IsAdmin(AdminLevel.ADMIN3))
{
player.SendNotification("~r~Du hast keinen Schlüssel.");
return;
@@ -94,7 +94,7 @@ namespace ReallifeGamemode.Server.Events
}
else if (sV is FactionVehicle fV)
{
if (fV.FactionId != u.FactionId)
if (!fV.GetOwners().Contains(u.FactionId ?? 0))
{
return;
}
@@ -152,7 +152,7 @@ namespace ReallifeGamemode.Server.Events
}
else if (sV is FactionVehicle fV)
{
if (fV.FactionId != u.FactionId)
if (!fV.GetOwners().Contains(u.FactionId ?? 0))
{
return;
}
@@ -205,7 +205,7 @@ namespace ReallifeGamemode.Server.Events
}
else if (sV is FactionVehicle fV)
{
if (fV.FactionId != u.FactionId || !u.FactionLeader)
if (!fV.GetOwners().Contains(u.FactionId ?? 0) || !u.FactionLeader)
{
player.SendNotification("~r~Du darfst dieses Fahrzeug nicht parken.");
return;