Merged group system into develop

This commit is contained in:
hydrant
2019-05-09 15:23:36 +02:00
68 changed files with 2447 additions and 565 deletions

View File

@@ -28,7 +28,7 @@ namespace ReallifeGamemode.Server.Managers
{
if (currentATM.Sprite == 500)
{
if(dbContext.ATMs.FirstOrDefault(a => a.Id == currentATM.Id) == null)
if (dbContext.ATMs.FirstOrDefault(a => a.Id == currentATM.Id) == null)
{
var dataSet = new ATM
{
@@ -46,7 +46,7 @@ namespace ReallifeGamemode.Server.Managers
}
}
}
if(addedATMs > 0)
if (addedATMs > 0)
{
NAPI.Util.ConsoleOutput(addedATMs + " Geldautomaten hinzugefügt");
}
@@ -54,7 +54,7 @@ namespace ReallifeGamemode.Server.Managers
{
NAPI.Util.ConsoleOutput("Keine Geldautomaten hinzugefügt");
}
dbContext.SaveChanges();
LoadATMs();
}
@@ -83,7 +83,7 @@ namespace ReallifeGamemode.Server.Managers
}
public static void ShowAtmUi(Client player, int atmId)
{
player.TriggerEvent("SERVER:ShowAtmUi", atmId);
player.TriggerEvent("SERVER:ShowAtmUi", atmId);
}
[RemoteEvent("CLIENT:ATM_MANAGER:ATM_ACTION")]
@@ -150,6 +150,6 @@ namespace ReallifeGamemode.Server.Managers
}
dbContext.SaveChanges();
}
}
}
}
}