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

Remove warnings

Browse Source
This commit is contained in:
Lennart Kampshoff
2019-12-21 13:49:33 +01:00
parent b4f4bb4622
commit c5f72c2ce5
53 changed files with 158 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReallifeGamemode.Client/ReallifeGamemode.Client.csproj
View File

@@ -6,12 +6,17 @@
<ApplicationIcon />
<StartupObject />
<Configurations>Debug;Release;ServerBuild</Configurations>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Gui\vehiclemenu\web\**" />
<Compile Remove="Jobs\BusDriver\**" />

1
ReallifeGamemode.DataService/ReallifeGamemode.DataService.csproj
View File

@@ -5,6 +5,7 @@
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<ItemGroup>

11
ReallifeGamemode.Database/Entities/ATM.cs
View File

@@ -1,12 +1,9 @@
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using System;
using System.Collections.Generic;
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using GTANetworkAPI;
using ReallifeGamemode.Database.Models;
/**
* @overview Life of German Reallife - Entities ATM (ATM.cs)
@@ -16,7 +13,7 @@ using System.Text;
namespace ReallifeGamemode.Database.Entities
{
public class ATM : IBankAccountOwner, IBankAccount
public partial class ATM : IBankAccountOwner, IBankAccount
{
[Key]
public int Id { get; set; }

8
ReallifeGamemode.Database/Entities/Ban.cs
View File

@@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using ReallifeGamemode.Database.Entities;
/**
* @overview Life of German Reallife - Entities Ban (Ban.cs)
@@ -13,7 +9,7 @@ using ReallifeGamemode.Database.Entities;
namespace ReallifeGamemode.Database.Entities
{
public class Ban
public partial class Ban
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

8
ReallifeGamemode.Database/Entities/BusRoute.cs
View File

@@ -1,12 +1,10 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
namespace ReallifeGamemode.Database.Entities
{
public class BusRoute
public partial class BusRoute
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@@ -17,7 +15,7 @@ namespace ReallifeGamemode.Database.Entities
public List<BusRoutePoint> RoutePoints { get; set; }
}
public class BusRoutePoint
public partial class BusRoutePoint
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

13
ReallifeGamemode.Database/Entities/BusinessBankAccount.cs
View File

@@ -1,21 +1,14 @@

using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
using ReallifeGamemode.Database;
namespace ReallifeGamemode.Database.Entities
{
public class BusinessBankAccount : IBankAccount
public partial class BusinessBankAccount : IBankAccount
{
[NotMapped]
private int _balance;
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int Id { get; set; }
public int Balance { get; set; }
public int BusinessId { get; set; }

7
ReallifeGamemode.Database/Entities/BusinessData.cs
View File

@@ -1,12 +1,9 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
namespace ReallifeGamemode.Database.Entities
{
public class BusinessData
public partial class BusinessData
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

2
ReallifeGamemode.Database/Entities/Character.cs
View File

@@ -9,7 +9,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace ReallifeGamemode.Database.Entities
{
public class Character
public partial class Character
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

2
ReallifeGamemode.Database/Entities/CharacterCloth.cs
View File

@@ -9,7 +9,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace ReallifeGamemode.Database.Entities
{
public class CharacterCloth
public partial class CharacterCloth
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

9
ReallifeGamemode.Database/Entities/ClothCombination.cs
View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Numerics;
using System.Text;
using System.ComponentModel.DataAnnotations;
/**
* @overview Life of German Reallife - Entities MaleCombination (MaleCombination.cs)
@@ -13,7 +8,7 @@ using System.Text;
namespace ReallifeGamemode.Database.Entities
{
public class ClothCombination
public partial class ClothCombination
{
[Key]
public int Id { get; set; }

9
ReallifeGamemode.Database/Entities/Door.cs
View File

@@ -1,9 +1,6 @@
using GTANetworkAPI;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
using GTANetworkAPI;
/**
* @overview Life of German Reallife - Entities Door (Door.cs)
@@ -13,7 +10,7 @@ using System.Text;
namespace ReallifeGamemode.Database.Entities
{
public class Door
public partial class Door
{
[Key]
public int Id { get; set; }

7
ReallifeGamemode.Database/Entities/DutyCloth.cs
View File

@@ -1,8 +1,5 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
/**
* @overview Life of German Reallife - Entities DutyCloth DutyCloth.cs
@@ -12,7 +9,7 @@ using System.Text;
namespace ReallifeGamemode.Database.Entities
{
public class DutyCloth
public partial class DutyCloth
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

7
ReallifeGamemode.Database/Entities/Faction.cs
View File

@@ -1,8 +1,7 @@
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using ReallifeGamemode.Database.Models;
/**
* @overview Life of German Reallife - Entities Faction (Faction.cs)
@@ -12,7 +11,7 @@ using System.Linq;
namespace ReallifeGamemode.Database.Entities
{
public class Faction : IBankAccountOwner
public partial class Faction : IBankAccountOwner
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

8
ReallifeGamemode.Database/Entities/FactionBankAccount.cs
View File

@@ -1,9 +1,5 @@
using GTANetworkAPI;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
/**
* @overview Life of German Reallife - Entities FactionBankAccount (FactionBankAccount.cs)
@@ -12,7 +8,7 @@ using System.Text;
*/
namespace ReallifeGamemode.Database.Entities
{
public class FactionBankAccount : IBankAccount
public partial class FactionBankAccount : IBankAccount
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

7
ReallifeGamemode.Database/Entities/FactionRank.cs
View File

@@ -1,11 +1,10 @@
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using ReallifeGamemode.Database.Models;
namespace ReallifeGamemode.Database.Entities
{
public class FactionRank
public partial class FactionRank
{
[Key]
public int Id { get; set; }

7
ReallifeGamemode.Database/Entities/FactionVehicles.cs
View File

@@ -1,7 +1,6 @@
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using ReallifeGamemode.Database.Models;
/**
* @overview Life of German Reallife - Entities FactionVehicles (FactionVehicle.cs)
@@ -12,7 +11,7 @@ using System.Linq;
namespace ReallifeGamemode.Database.Entities
{
[Table("FactionVehicles")]
public class FactionVehicle : ServerVehicle
public partial class FactionVehicle : ServerVehicle
{
[ForeignKey("Faction")]
public int? FactionId { get; set; }

8
ReallifeGamemode.Database/Entities/FactionWeapon.cs
View File

@@ -1,13 +1,9 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
using GTANetworkAPI;
namespace ReallifeGamemode.Database.Entities
{
public class FactionWeapon
public partial class FactionWeapon
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

8
ReallifeGamemode.Database/Entities/GotoPoints.cs
View File

@@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using ReallifeGamemode.Database.Entities;
/**
* @overview Life of German Reallife - Entities GotoPoints (GotoPoints.cs)
@@ -13,7 +9,7 @@ using ReallifeGamemode.Database.Entities;
namespace ReallifeGamemode.Database.Entities
{
public class GotoPoint
public partial class GotoPoint
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

10
ReallifeGamemode.Database/Entities/Group.cs
View File

@@ -1,16 +1,12 @@
using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database.Models;
namespace ReallifeGamemode.Database.Entities
{
public class Group : IBankAccountOwner
public partial class Group : IBankAccountOwner
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

7
ReallifeGamemode.Database/Entities/GroupBankAccount.cs
View File

@@ -1,12 +1,9 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
namespace ReallifeGamemode.Database.Entities
{
public class GroupBankAccount : IBankAccount
public partial class GroupBankAccount : IBankAccount
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

12
ReallifeGamemode.Database/Entities/GroupVehicle.cs
View File

@@ -1,15 +1,11 @@
using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database.Models;
namespace ReallifeGamemode.Database.Entities
{
public class GroupVehicle : ServerVehicle
public partial class GroupVehicle : ServerVehicle
{
public Group Group { get; set; }

10
ReallifeGamemode.Database/Entities/House.cs
View File

@@ -1,14 +1,10 @@
using GTANetworkAPI;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using GTANetworkAPI;
namespace ReallifeGamemode.Database.Entities
{
public class House
public partial class House
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

7
ReallifeGamemode.Database/Entities/HouseRental.cs
View File

@@ -1,12 +1,9 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
namespace ReallifeGamemode.Database.Entities
{
public class HouseRental
public partial class HouseRental
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

11
ReallifeGamemode.Database/Entities/Interior.cs
View File

@@ -1,14 +1,11 @@
using GTANetworkAPI;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
using GTANetworkAPI;
using Newtonsoft.Json;
namespace ReallifeGamemode.Database.Entities
{
public class Interior
public partial class Interior
{
[NotMapped]
private Vector3 _enterPosition;

12
ReallifeGamemode.Database/Entities/JobVehicle.cs
View File

@@ -1,14 +1,6 @@
using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using ReallifeGamemode.Database.Models;
namespace ReallifeGamemode.Database.Entities
namespace ReallifeGamemode.Database.Entities
{
public class JobVehicle : ServerVehicle
public partial class JobVehicle : ServerVehicle
{
public int JobId { get; set; }
}

7
ReallifeGamemode.Database/Entities/Location.cs
View File

@@ -1,11 +1,8 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
using System.ComponentModel.DataAnnotations.Schema;
namespace ReallifeGamemode.Database.Entities
{
public class Location
public partial class Location
{
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int Id { get; set; }

4
ReallifeGamemode.Database/Entities/Logs/BankAccountTransactionHistory.cs
View File

@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
/**
* @overview Life of German Reallife - Logs BankAccountTransactionHistory (BankAccountTransactionHistory.cs)
@@ -12,7 +10,7 @@ using System.Text;
namespace ReallifeGamemode.Database.Entities.Logs
{
public class BankAccountTransactionHistory
public partial class BankAccountTransactionHistory
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

5
ReallifeGamemode.Database/Entities/Logs/Death.cs
View File

@@ -1,9 +1,6 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using ReallifeGamemode.Database.Entities;
/**
* @overview Life of German Reallife - Logs Death (Death.cs)
@@ -13,7 +10,7 @@ using ReallifeGamemode.Database.Entities;
namespace ReallifeGamemode.Database.Entities.Logs
{
public class Death
public partial class Death
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

7
ReallifeGamemode.Database/Entities/News.cs
View File

@@ -1,12 +1,9 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
namespace ReallifeGamemode.Database.Entities
{
public class News
public partial class News
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

7
ReallifeGamemode.Database/Entities/Saves/SavedBlip.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
/**
@@ -12,7 +9,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace ReallifeGamemode.Database.Entities.Saves
{
public class SavedBlip
public partial class SavedBlip
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

7
ReallifeGamemode.Database/Entities/Saves/SavedMarker.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
/**
@@ -12,7 +9,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace ReallifeGamemode.Database.Entities.Saves
{
public class SavedMarker
public partial class SavedMarker
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

7
ReallifeGamemode.Database/Entities/Saves/SavedPed.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
/**
@@ -12,7 +9,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace ReallifeGamemode.Database.Entities.Saves
{
public class SavedPed
public partial class SavedPed
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

7
ReallifeGamemode.Database/Entities/Saves/SavedPickup.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
/**
@@ -12,7 +9,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace ReallifeGamemode.Database.Entities.Saves
{
public class SavedPickup
public partial class SavedPickup
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

7
ReallifeGamemode.Database/Entities/Saves/SavedTextLabel.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
/**
@@ -12,7 +9,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace ReallifeGamemode.Database.Entities.Saves
{
public class SavedTextLabel
public partial class SavedTextLabel
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

12
ReallifeGamemode.Database/Entities/Saves/SavedVehicle.cs
View File

@@ -1,12 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using GTANetworkAPI;
using ReallifeGamemode.Database.Entities;
/**
/**
* @overview Life of German Reallife - Saves SavedVehicle.cs
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
@@ -14,7 +6,7 @@ using ReallifeGamemode.Database.Entities;
namespace ReallifeGamemode.Database.Entities.Saves
{
public class SavedVehicle : ServerVehicle
public partial class SavedVehicle : ServerVehicle
{
public override string ToString()
{

12
ReallifeGamemode.Database/Entities/SchoolVehicle.cs
View File

@@ -1,14 +1,6 @@
using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using ReallifeGamemode.Database.Models;
namespace ReallifeGamemode.Database.Entities
namespace ReallifeGamemode.Database.Entities
{
public class SchoolVehicle : ServerVehicle
public partial class SchoolVehicle : ServerVehicle
{
public int SchoolId { get; set; }
}

9
ReallifeGamemode.Database/Entities/ShopVehicles.cs
View File

@@ -1,9 +1,4 @@
using GTANetworkAPI;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
using System.ComponentModel.DataAnnotations.Schema;
/**
* @overview Life of German Reallife - Entities ShopVehicles (ShopVehicles.cs)
@@ -14,7 +9,7 @@ using System.Text;
namespace ReallifeGamemode.Database.Entities
{
[Table("ShopVehicles")]
public class ShopVehicle : ServerVehicle
public partial class ShopVehicle : ServerVehicle
{
public int BusinessId { get; set; }
public int Price { get; set; }

9
ReallifeGamemode.Database/Entities/TuningGarage.cs
View File

@@ -1,13 +1,10 @@
using GTANetworkAPI;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
using GTANetworkAPI;
namespace ReallifeGamemode.Database.Entities
{
public class TuningGarage
public partial class TuningGarage
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

9
ReallifeGamemode.Database/Entities/Turfs.cs
View File

@@ -1,14 +1,9 @@
using GTANetworkAPI;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
namespace ReallifeGamemode.Database.Entities
{
public class Turfs
public partial class Turfs
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

11
ReallifeGamemode.Database/Entities/User.cs
View File

@@ -1,12 +1,9 @@
using GTANetworkAPI;
using Newtonsoft.Json;
using ReallifeGamemode.Database;
using ReallifeGamemode.Database.Models;
using System;
using System.Collections.Generic;
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using GTANetworkAPI;
using ReallifeGamemode.Database.Models;
/**
* @overview Life of German Reallife - Entities User (User.cs)
@@ -16,7 +13,7 @@ using System.Linq;
namespace ReallifeGamemode.Database.Entities
{
public class User : IBankAccountOwner
public partial class User : IBankAccountOwner
{
[NotMapped]
private int _wanteds;

7
ReallifeGamemode.Database/Entities/UserBankAccount.cs
View File

@@ -1,8 +1,7 @@
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Services;
/**
@@ -13,7 +12,7 @@ using ReallifeGamemode.Services;
namespace ReallifeGamemode.Database.Entities
{
public class UserBankAccount : IBankAccount
public partial class UserBankAccount : IBankAccount
{
[NotMapped]
private int _balance;

7
ReallifeGamemode.Database/Entities/UserItem.cs
View File

@@ -1,8 +1,7 @@
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using ReallifeGamemode.Database.Models;
/**
* @overview Life of German Reallife - Entities UserItem (UserItem.cs)
@@ -12,7 +11,7 @@ using System.Linq;
namespace ReallifeGamemode.Database.Entities
{
public class UserItem
public partial class UserItem
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

2
ReallifeGamemode.Database/Entities/UserVehicle.cs
View File

@@ -11,7 +11,7 @@ using ReallifeGamemode.Database.Models;
namespace ReallifeGamemode.Database.Entities
{
[Table("UserVehicles")]
public class UserVehicle : ServerVehicle
public partial class UserVehicle : ServerVehicle
{
[ForeignKey("User")]
public int UserId { get; set; }

8
ReallifeGamemode.Database/Entities/VehicleInventory.cs
View File

@@ -1,10 +1,6 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace ReallifeGamemode.Database.Entities
namespace ReallifeGamemode.Database.Entities
{
public class VehicleInventory
public partial class VehicleInventory
{
public int ID;
public int currentWeight;

8
ReallifeGamemode.Database/Entities/VehicleItem.cs
View File

@@ -1,15 +1,11 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
namespace ReallifeGamemode.Database.Entities
{
public class VehicleItem
public partial class VehicleItem
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

7
ReallifeGamemode.Database/Entities/VehicleMod.cs
View File

@@ -1,12 +1,9 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
namespace ReallifeGamemode.Database.Entities
{
public class VehicleMod
public partial class VehicleMod
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

7
ReallifeGamemode.Database/Entities/Whitelist.cs
View File

@@ -1,12 +1,9 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
namespace ReallifeGamemode.Database.Entities
{
public class Whitelist
public partial class Whitelist
{
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

3
ReallifeGamemode.Database/ReallifeGamemode.Database.csproj
View File

@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netcoreapp2.0</TargetFramework>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<ItemGroup>

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

@@ -745,11 +745,11 @@ namespace ReallifeGamemode.Server.Managers
double distanceDriven;
try
{
distanceDriven = v.HasSharedData("drivenDistance") ? (double)v.GetSharedData("drivenDistance") : 0D;
distanceDriven = v.HasSharedData("drivenDistance") ? (double)v.GetSharedData("drivenDistance") : 0D;
}
catch(Microsoft.CSharp.RuntimeBinder.RuntimeBinderException ex)
catch (Microsoft.CSharp.RuntimeBinder.RuntimeBinderException)
{
distanceDriven = (double)0;
distanceDriven = 0;
}
double distance = lastPosition.DistanceTo(v.Position) / 1000.0;
@@ -814,11 +814,11 @@ namespace ReallifeGamemode.Server.Managers
public static Vehicle GetVehicleFromId(int id)
{
using(var dbcontext = new DatabaseContext())
using (var dbcontext = new DatabaseContext())
{
ServerVehicle sVeh = dbcontext.ServerVehicles.Where(sV => sV.Id == id).FirstOrDefault();
return GetVehicleFromServerVehicle(sVeh);
}
}
}
public static Vehicle GetVehicleFromServerVehicle(ServerVehicle serverVehicle)
@@ -866,7 +866,7 @@ namespace ReallifeGamemode.Server.Managers
{
ServerVehicle serverVehicle = GetServerVehicleFromVehicle(vehicle);
if(serverVehicle == null)
if (serverVehicle == null)
{
vehicle.Delete();
return;

22
ReallifeGamemode.Server/Report/Report.cs
View File

@@ -12,7 +12,6 @@ using System.Collections.Generic;
using Newtonsoft.Json;
using ReallifeGamemode.Database;
using ReallifeGamemode.Services;
using Newtonsoft.Json;
namespace ReallifeGamemode.Server.Report
{
@@ -47,7 +46,7 @@ namespace ReallifeGamemode.Server.Report
List<string> listPlayers = new List<string>();
List<string> listTicketnames = new List<string>();
for (int a=0; a< listReports.Count; a++)
for (int a = 0; a < listReports.Count; a++)
{
ReportManage temp = listReports[a];
@@ -59,7 +58,7 @@ namespace ReallifeGamemode.Server.Report
}
//ChatService.SendMessage(client, JsonConvert.SerializeObject(listPlayers));
if (listPlayers.Count == 0 || listTicketnames.Count == 0)
if (listPlayers.Count == 0 || listTicketnames.Count == 0)
{
return;
}
@@ -74,13 +73,14 @@ namespace ReallifeGamemode.Server.Report
Client player = ClientService.GetClientByNameOrId(client);
if (player == null)
return;
for (int a = 0; a < listReports.Count; a++)
{
ReportManage temp = listReports[a];
if (temp.getAdmin().Equals(admin.Name)){
if (temp.getAdmin().Equals(admin.Name))
{
admin.SendChatMessage("Du hast bereits ein Ticket angenommen");
return;
}
@@ -154,7 +154,7 @@ namespace ReallifeGamemode.Server.Report
{
userIsAdmin = true;
}
}
//Für User
if ((!client.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) || userIsAdmin)
@@ -163,14 +163,14 @@ namespace ReallifeGamemode.Server.Report
for (int a = 0; a < listReports.Count; a++)
{
temp = listReports[a];
if (temp.getUser().Equals(client.Name) && !temp.getAdmin().Equals("N/A"))
if (temp.getUser().Equals(client.Name) && !temp.getAdmin().Equals("N/A"))
{
cont = true;
adminname = listReports[a].getAdmin();
break;
}
}
if(!cont)
if (!cont)
{
return;
}
@@ -218,11 +218,11 @@ namespace ReallifeGamemode.Server.Report
Client player = ClientService.GetClientByNameOrId(name);
if (player == null)
return;
for (int a = 0; a < listReports.Count; a++)
{
ReportManage temp = listReports[a];
if (temp.getUser().Equals(player.Name))
{
ChatService.SendMessage(player, "!{#addc8d} " + user.Name + " hat dein Ticket gelöscht!");
@@ -231,7 +231,7 @@ namespace ReallifeGamemode.Server.Report
break;
}
}
}
}
}

3
ReallifeGamemode.Services/ReallifeGamemode.Services.csproj
View File

@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netcoreapp2.0</TargetFramework>
<Configurations>Debug;Release;ServerBuild</Configurations>
<PlatformTarget>x64</PlatformTarget>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<ItemGroup>

50
ReallifeGamemode.sln
View File

@@ -22,7 +22,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReallifeGamemode.Database",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReallifeGamemode.Services", "ReallifeGamemode.Services\ReallifeGamemode.Services.csproj", "{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReallifeGamemode.DataService", "ReallifeGamemode.DataService\ReallifeGamemode.DataService.csproj", "{61157B05-135C-40C5-B694-5F27CE53B334}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReallifeGamemode.DataService", "ReallifeGamemode.DataService\ReallifeGamemode.DataService.csproj", "{61157B05-135C-40C5-B694-5F27CE53B334}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -48,52 +48,52 @@ Global
{6A490613-C8B7-4C45-8562-4455F59BCDD4}.ServerBuild|x64.Build.0 = ServerBuild|x64
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Debug|x64.ActiveCfg = Debug|Any CPU
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Debug|x64.Build.0 = Debug|Any CPU
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Debug|x64.ActiveCfg = Debug|x64
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Debug|x64.Build.0 = Debug|x64
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Release|Any CPU.Build.0 = Release|Any CPU
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Release|x64.ActiveCfg = Release|Any CPU
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Release|x64.Build.0 = Release|Any CPU
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Release|x64.ActiveCfg = Release|x64
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Release|x64.Build.0 = Release|x64
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.ServerBuild|Any CPU.ActiveCfg = ServerBuild|Any CPU
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.ServerBuild|Any CPU.Build.0 = ServerBuild|Any CPU
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.ServerBuild|x64.ActiveCfg = ServerBuild|Any CPU
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.ServerBuild|x64.Build.0 = ServerBuild|Any CPU
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.ServerBuild|x64.ActiveCfg = ServerBuild|x64
{67472A94-4B6C-46B5-AB57-C2988B55C8C7}.ServerBuild|x64.Build.0 = ServerBuild|x64
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|x64.ActiveCfg = Debug|Any CPU
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|x64.Build.0 = Debug|Any CPU
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|x64.ActiveCfg = Debug|x64
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|x64.Build.0 = Debug|x64
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|Any CPU.Build.0 = Release|Any CPU
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|x64.ActiveCfg = Release|Any CPU
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|x64.Build.0 = Release|Any CPU
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|x64.ActiveCfg = Release|x64
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|x64.Build.0 = Release|x64
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|Any CPU.ActiveCfg = Debug|Any CPU
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|Any CPU.Build.0 = Debug|Any CPU
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|x64.ActiveCfg = Debug|Any CPU
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|x64.Build.0 = Debug|Any CPU
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|x64.ActiveCfg = Release|x64
{9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|x64.Build.0 = Release|x64
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|x64.ActiveCfg = Debug|Any CPU
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|x64.Build.0 = Debug|Any CPU
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|x64.ActiveCfg = Debug|x64
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|x64.Build.0 = Debug|x64
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|Any CPU.Build.0 = Release|Any CPU
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|x64.ActiveCfg = Release|Any CPU
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|x64.Build.0 = Release|Any CPU
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|x64.ActiveCfg = Release|x64
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|x64.Build.0 = Release|x64
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|Any CPU.ActiveCfg = Debug|Any CPU
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|Any CPU.Build.0 = Debug|Any CPU
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|x64.ActiveCfg = Debug|Any CPU
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|x64.Build.0 = Debug|Any CPU
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|x64.ActiveCfg = ServerBuild|x64
{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|x64.Build.0 = ServerBuild|x64
{61157B05-135C-40C5-B694-5F27CE53B334}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{61157B05-135C-40C5-B694-5F27CE53B334}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61157B05-135C-40C5-B694-5F27CE53B334}.Debug|x64.ActiveCfg = Debug|Any CPU
{61157B05-135C-40C5-B694-5F27CE53B334}.Debug|x64.Build.0 = Debug|Any CPU
{61157B05-135C-40C5-B694-5F27CE53B334}.Debug|x64.ActiveCfg = Debug|x64
{61157B05-135C-40C5-B694-5F27CE53B334}.Debug|x64.Build.0 = Debug|x64
{61157B05-135C-40C5-B694-5F27CE53B334}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61157B05-135C-40C5-B694-5F27CE53B334}.Release|Any CPU.Build.0 = Release|Any CPU
{61157B05-135C-40C5-B694-5F27CE53B334}.Release|x64.ActiveCfg = Release|Any CPU
{61157B05-135C-40C5-B694-5F27CE53B334}.Release|x64.Build.0 = Release|Any CPU
{61157B05-135C-40C5-B694-5F27CE53B334}.Release|x64.ActiveCfg = Release|x64
{61157B05-135C-40C5-B694-5F27CE53B334}.Release|x64.Build.0 = Release|x64
{61157B05-135C-40C5-B694-5F27CE53B334}.ServerBuild|Any CPU.ActiveCfg = Debug|Any CPU
{61157B05-135C-40C5-B694-5F27CE53B334}.ServerBuild|Any CPU.Build.0 = Debug|Any CPU
{61157B05-135C-40C5-B694-5F27CE53B334}.ServerBuild|x64.ActiveCfg = Debug|Any CPU
{61157B05-135C-40C5-B694-5F27CE53B334}.ServerBuild|x64.Build.0 = Debug|Any CPU
{61157B05-135C-40C5-B694-5F27CE53B334}.ServerBuild|x64.ActiveCfg = Release|x64
{61157B05-135C-40C5-B694-5F27CE53B334}.ServerBuild|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

4
postbuild.ps1
View File

@@ -7,8 +7,8 @@
# set parameters
param (
[string]$buildDirectory,
[string]$buildFilename
[string]$buildDirectory,
[string]$buildFilename
)
# set constant path