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

fix scheine zeigen

Browse Source
This commit is contained in:
hydrant
2020-04-18 21:41:14 +02:00
parent 5b9868ac34
commit 9f827b476d
4 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReallifeGamemode.Client/Interaction/interactionmenu.ts
View File

@@ -232,12 +232,13 @@ export default function (globalData: IGlobalData) {
} }
licenseMenu.AddItem(menuItem); licenseMenu.AddItem(menuItem);
licenseMenu.AddItem(new UIMenuItem("Lizenzen an Spieler zeigen")); var showItem = new UIMenuItem("Lizenzen an Spieler zeigen");
licenseMenu.AddItem(showItem);
licenseMenu.Visible = false; licenseMenu.Visible = false;
licenseMenu.ItemSelect.on((item, index) => { licenseMenu.ItemSelect.on((item, index) => {
if (index === 4) { if (item === showItem) {
var input = new InputHelper("Welchen Spieler möchtest du deine Lizenzen zeigen (Name / ID)?", globalData); var input = new InputHelper("Welchen Spieler möchtest du deine Lizenzen zeigen (Name / ID)?", globalData);
input.show(); input.show();
input.getValue(name => { input.getValue(name => {

4
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -1873,6 +1873,8 @@ namespace ReallifeGamemode.Server.Commands
User u = target.GetUser(dbContext); User u = target.GetUser(dbContext);
FactionHelper.ResetPlayer(target, u, dbContext);
if (faction != 0) if (faction != 0)
{ {
u.FactionId = f.Id; u.FactionId = f.Id;
@@ -1939,6 +1941,8 @@ namespace ReallifeGamemode.Server.Commands
User u = target.GetUser(dbContext); User u = target.GetUser(dbContext);
FactionHelper.ResetPlayer(target, u, dbContext);
u.FactionId = f.Id; u.FactionId = f.Id;
u.FactionRankId = dbContext.FactionRanks. u.FactionRankId = dbContext.FactionRanks.
OrderByDescending(x => x.Order) OrderByDescending(x => x.Order)

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

@@ -57,6 +57,8 @@ namespace ReallifeGamemode.Server.Managers
User u = leader.GetUser(dbContext); User u = leader.GetUser(dbContext);
User own = player.GetUser(dbContext); User own = player.GetUser(dbContext);
FactionHelper.ResetPlayer(player, own, dbContext);
own.Faction = u.Faction; own.Faction = u.Faction;
own.FactionLeader = false; own.FactionLeader = false;
own.FactionRank = dbContext own.FactionRank = dbContext

16
ReallifeGamemode.Server/Util/FactionHelper.cs
View File

@@ -1,7 +1,10 @@
using GTANetworkAPI; using System.Linq;
using GTANetworkAPI;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models; using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Managers;
namespace ReallifeGamemode.Server.Util namespace ReallifeGamemode.Server.Util
{ {
@@ -29,5 +32,16 @@ namespace ReallifeGamemode.Server.Util
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
} }
public static void ResetPlayer(Player player, User user, DatabaseContext dbContext)
{
user.SetData("duty", false);
var userClothes = dbContext.CharacterClothes.Where(c => c.UserId == user.Id && c.Duty == true);
dbContext.CharacterClothes.RemoveRange(userClothes);
CharacterCreator.ApplyCharacter(player);
Events.UpdateCharacterCloth.LoadCharacterDefaults(player);
}
} }
} }