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

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;
}
}
}
}
}