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

fix invite vielleicht

Browse Source
This commit is contained in:
hydrant
2020-04-13 15:55:24 +02:00
parent b3d9798c1b
commit 1b1231647f
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -42,7 +42,7 @@ namespace ReallifeGamemode.Server.Managers
return; return;
} }
Player leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData<NetHandle>("accept_faction_invite")); Player leader = NAPI.Player.GetPlayerFromName(player.GetData<string>("accept_faction_invite"));
player.ResetData("accept_faction_invite"); player.ResetData("accept_faction_invite");
if (leader == null) if (leader == null)
@@ -51,25 +51,25 @@ namespace ReallifeGamemode.Server.Managers
return; return;
} }
using (var dbContext = new DatabaseContext()) using (var dbContext = new DatabaseContext(true))
{ {
User u = leader.GetUser(dbContext); User u = leader.GetUser(dbContext);
User own = player.GetUser(dbContext); User own = player.GetUser(dbContext);
own.FactionId = u.FactionId; own.Faction = u.Faction;
own.FactionLeader = false; own.FactionLeader = false;
own.FactionRankId = dbContext own.FactionRank = dbContext
.FactionRanks .FactionRanks
.OrderBy(x => x.Order) .OrderBy(x => x.Order)
.Where(r => r.FactionId == own.FactionId) .Where(r => r.FactionId == own.FactionId)
.FirstOrDefault()?.Id ?? null; .FirstOrDefault();
ChatService.SendMessage(leader, "!{02FCFF}" + player.Name + " hat die Einladung angenommen."); ChatService.SendMessage(leader, "!{02FCFF}" + player.Name + " hat die Einladung angenommen.");
ChatService.SendMessage(player, "!{02FCFF}Du hast die Einladung angenommen."); ChatService.SendMessage(player, "!{02FCFF}Du hast die Einladung angenommen.");
switch (own.FactionId) switch (own.FactionId)
{ {
case null: default:
player.SetSharedData("blipColor", 0); player.SetSharedData("blipColor", 0);
break; break;
case 8: case 8:
@@ -94,7 +94,7 @@ namespace ReallifeGamemode.Server.Managers
return; return;
} }
Player leader = NAPI.Player.GetPlayerFromHandle((NetHandle)player.GetData<NetHandle>("accept_group_invite")); Player leader = NAPI.Player.GetPlayerFromName(player.GetData<string>("accept_group_invite"));
player.ResetData("accept_group_invite"); player.ResetData("accept_group_invite");
if (leader == null) if (leader == null)
@@ -192,10 +192,10 @@ namespace ReallifeGamemode.Server.Managers
if (targetUser?.FactionId != null) if (targetUser?.FactionId != null)
{ {
ChatService.ErrorMessage(player, "Dieser Spieler ist schon in einer Fraktion"); ChatService.ErrorMessage(player, "Dieser Spieler ist schon in einer Fraktion");
return; //return;
} }
target.SetData("accept_faction_invite", player.Handle); target.SetData("accept_faction_invite", player.Name);
ChatService.SendMessage(player, "!{02FCFF}Du hast dem Spieler " + target.Name + " eine Einladung in deine Fraktion gesendet."); ChatService.SendMessage(player, "!{02FCFF}Du hast dem Spieler " + target.Name + " eine Einladung in deine Fraktion gesendet.");
ChatService.SendMessage(target, "!{02FCFF}Du hast von " + player.Name + " eine Einladung in die Fraktion \"" + playerUser.Faction.Name + "\" erhalten."); ChatService.SendMessage(target, "!{02FCFF}Du hast von " + player.Name + " eine Einladung in die Fraktion \"" + playerUser.Faction.Name + "\" erhalten.");
@@ -215,7 +215,7 @@ namespace ReallifeGamemode.Server.Managers
return; return;
} }
target.SetData("accept_group_invite", player.Handle); target.SetData("accept_group_invite", player.Name);
ChatService.SendMessage(player, "!{02FCFF}Du hast dem Spieler " + target.Name + " eine Einladung in deine Gruppe gesendet."); ChatService.SendMessage(player, "!{02FCFF}Du hast dem Spieler " + target.Name + " eine Einladung in deine Gruppe gesendet.");
ChatService.SendMessage(target, "!{02FCFF}Du hast von " + player.Name + " eine Einladung in die Gruppe \"" + playerUser.Group.Name + "\" erhalten."); ChatService.SendMessage(target, "!{02FCFF}Du hast von " + player.Name + " eine Einladung in die Gruppe \"" + playerUser.Group.Name + "\" erhalten.");