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

Removed User.GetFaction()

Browse Source
This commit is contained in:
hydrant
2019-03-10 13:02:03 +01:00
parent f732f053a8
commit ed069fd1d7
8 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ReallifeGamemode.Server/Commands/Admin.cs → ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -23,7 +23,7 @@ using ReallifeGamemode.Server.Models;
namespace ReallifeGamemode.Server.Commands
{
public class Admin : Script
public class AdminCommands : Script
{
#region Test
[Command("eat", "~m~Benutzung: ~s~/eat [Item]")]
@@ -1550,7 +1550,7 @@ namespace ReallifeGamemode.Server.Commands
case "fvehicle":
if (player.IsInVehicle)
{
if (player.GetUser().GetFaction() == null)
if (player.GetUser().Faction == null)
{
player.SendChatMessage("~m~Du bist in keiner Fraktion! Invite dich erst mit ~y~/ainvite");
return;
@@ -2118,7 +2118,7 @@ namespace ReallifeGamemode.Server.Commands
using(var dbContext = new DatabaseContext())
{
Entities.User owner = business.GetOwner(dbContext);
User owner = business.GetOwner(dbContext);
if(owner == null)
{
player.SendChatMessage("~r~[FEHLER]~s~ Dieses Business hat momentan keinen Besitzer.");
@@ -2128,7 +2128,7 @@ namespace ReallifeGamemode.Server.Commands
owner.BusinessId = null;
business.GetBankAccount(dbContext).Balance = 0;
owner.GetClient()?.SendChatMessage("~b~[ADMIN]~s~ Dir wurde von ~y~" + player.Name + "~s~ dein Business entzogen.");
owner.Client?.SendChatMessage("~b~[ADMIN]~s~ Dir wurde von ~y~" + player.Name + "~s~ dein Business entzogen.");
player.SendChatMessage("~b~[ADMIN]~s~ Du hast ~y~" + owner.Name + "~s~ sein Business ~o~" + business.Name + "~s~ entzogen.");
dbContext.SaveChanges();

12
ReallifeGamemode.Server/Commands/Faction.cs → ReallifeGamemode.Server/Commands/FactionCommands.cs
View File

@@ -15,14 +15,14 @@ using System.Text.RegularExpressions;
namespace ReallifeGamemode.Server.Commands
{
class Faction : Script
class FactionCommands : Script
{
#region Chat Commands
[Command("f", "~m~Benutzung: ~s~/f [Nachricht]", GreedyArg = true)]
public void CmdFactionF(Client player, string message)
{
Entities.Faction f = player.GetUser()?.GetFaction();
Faction f = player.GetUser()?.Faction;
if (f == null || f.StateOwned)
{
ChatService.NotAuthorized(player);
@@ -38,7 +38,7 @@ namespace ReallifeGamemode.Server.Commands
[Command("r", "~m~Benutzung: ~s~/r [Nachricht]", GreedyArg = true)]
public void CmdFactionR(Client player, string message)
{
Entities.Faction f = player.GetUser()?.GetFaction();
Entities.Faction f = player.GetUser()?.Faction;
if (f == null || !f.StateOwned)
{
ChatService.NotAuthorized(player);
@@ -54,7 +54,7 @@ namespace ReallifeGamemode.Server.Commands
[Command("d", "~m~Benutzung: ~s~/d [Nachricht]", GreedyArg = true)]
public void CmdFactionD(Client player, string message)
{
Entities.Faction f = player.GetUser()?.GetFaction();
Faction f = player.GetUser()?.Faction;
if (f == null || !f.StateOwned)
{
ChatService.NotAuthorized(player);
@@ -97,7 +97,7 @@ namespace ReallifeGamemode.Server.Commands
target.SetData("accept_invite", player.Handle);
player.SendChatMessage("!{02FCFF}Du hast dem Spieler " + target.Name + " eine Einladung in deine Fraktion gesendet.");
target.SendChatMessage("!{02FCFF}Du hast von " + player.Name + " eine Einladung in die Fraktion \"" + player.GetUser().GetFaction().Name + "\" erhalten.");
target.SendChatMessage("!{02FCFF}Du hast von " + player.Name + " eine Einladung in die Fraktion \"" + player.GetUser().Faction.Name + "\" erhalten.");
target.SendChatMessage("!{02FCFF}Benutze '/accept invite', um die Einladung anzunehmen");
return;
@@ -201,7 +201,7 @@ namespace ReallifeGamemode.Server.Commands
message = Regex.Replace(message, "(~[a-zA-Z]~{1})|(!{(.*)})", "");
string broadcastMsg = "~y~[" + player.GetUser().GetFaction().Name + "] " + player.Name + ": " + message;
string broadcastMsg = "~y~[" + player.GetUser().Faction.Name + "] " + player.Name + ": " + message;
NAPI.Pools.GetAllPlayers().ForEach(p =>
{

14
ReallifeGamemode.Server/Commands/User.cs → ReallifeGamemode.Server/Commands/UserCommands.cs
View File

@@ -7,7 +7,7 @@ using System.Linq;
namespace ReallifeGamemode.Server.Commands
{
class User : Script
class UserCommands : Script
{
[Command("accept", "~m~Benutzung: ~s~/accept [invite]")]
public void CmdUserAccept(Client player, string option)
@@ -38,14 +38,16 @@ namespace ReallifeGamemode.Server.Commands
return;
}
Entities.User u = leader.GetUser(dbContext);
Entities.User own = player.GetUser(dbContext);
User u = leader.GetUser(dbContext);
User own = player.GetUser(dbContext);
own.FactionId = u.FactionId;
own.FactionLeader = false;
own.FactionRankId = dbContext.FactionRanks.
OrderBy(x => x.Order)
.FirstOrDefault(r => r.FactionId == own.FactionId)?.Id ?? null;
own.FactionRankId = dbContext
.FactionRanks
.OrderBy(x => x.Order)
.Where(r => r.FactionId == own.FactionId)
.FirstOrDefault()?.Id ?? null;
leader.SendChatMessage("!{02FCFF}" + player.Name + " hat die Einladung angenommen.");
player.SendChatMessage("!{02FCFF}Du hast die Einladung angenommen.");