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

Merge

Browse Source
This commit is contained in:
kookroach
2021-04-05 00:48:35 +02:00
parent d9c39638c6 e30f8710d6
commit 803ab98546
9 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Client/Gui/nametags.ts
View File

@@ -2,7 +2,7 @@
import game from ".."; import game from "..";
const maxDistance = 25 * 25; const maxDistance = 40 * 40;
const width = 0.03; const width = 0.03;
const height = 0.0065; const height = 0.0065;
const border = 0.001; const border = 0.001;

1
ReallifeGamemode.Client/core/rage-mp/entities.ts
View File

@@ -73,7 +73,6 @@ class RagePlayer extends RageEntity implements IPlayer {
get nametagColor(): number { get nametagColor(): number {
var color = this.player.getVariable("nameTagColor"); var color = this.player.getVariable("nameTagColor");
game.ui.sendChatMessage(`player = ${this.player.name} - color = ${color}`);
if (!color) if (!color)
return 0; return 0;
return color; return color;

2
ReallifeGamemode.Client/core/rage-mp/game.ts
View File

@@ -11,7 +11,7 @@ export default class RageGame implements IGame {
ui: IUi = new RageUi; ui: IUi = new RageUi;
wait(ms: number): void { wait(ms: number): void {
mp.game.wait(ms); mp.game.waitAsync(ms);
} }
disableDefaultEngineBehaviour(): void { disableDefaultEngineBehaviour(): void {

2
ReallifeGamemode.Client/inputhelper/index.ts
View File

@@ -69,7 +69,7 @@ export default class InputHelper {
private valueGetter(): Promise<string> { private valueGetter(): Promise<string> {
return new Promise(resolve => { return new Promise(resolve => {
while (this.value === undefined) { while (this.value === undefined) {
mp.game.wait(1); mp.game.waitAsync(1);
} }
resolve(this.value); resolve(this.value);
}); });

2
ReallifeGamemode.Server.Core/Commands/Command.cs
View File

@@ -23,6 +23,6 @@ namespace ReallifeGamemode.Server.Core.Commands
Log = LogManager.GetLogger(this.GetType()); Log = LogManager.GetLogger(this.GetType());
} }
protected DatabaseContext GetDbContext(bool useLoggerFactory = true) => Main.GetDbContext(useLoggerFactory); protected DatabaseContext GetDbContext(bool useLoggerFactory = false) => Main.GetDbContext(useLoggerFactory);
} }
} }

2
ReallifeGamemode.Server.Core/Main.cs
View File

@@ -64,7 +64,7 @@ namespace ReallifeGamemode.Server.Core
} }
} }
public static DatabaseContext GetDbContext(bool useLoggerFactory = true) public static DatabaseContext GetDbContext(bool useLoggerFactory = false)
{ {
return new DatabaseContext(useLoggerFactory); return new DatabaseContext(useLoggerFactory);
} }

2
ReallifeGamemode.Server.Core/Script.cs
View File

@@ -21,6 +21,6 @@ namespace ReallifeGamemode.Server.Core
Log = LogManager.GetLogger(GetType()); Log = LogManager.GetLogger(GetType());
} }
protected DatabaseContext GetDbContext(bool useLoggerFactory = true) => Main.GetDbContext(useLoggerFactory); protected DatabaseContext GetDbContext(bool useLoggerFactory = false) => Main.GetDbContext(useLoggerFactory);
} }
} }

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

@@ -1493,30 +1493,30 @@ namespace ReallifeGamemode.Server.Commands
{ {
case null: case null:
target.SetSharedData("blipColor", 0); target.SetSharedData("blipColor", 0);
player.SetSharedData("nameTagColor", 0); target.SetSharedData("nameTagColor", 0);
break; break;
case 0: case 0:
player.SetSharedData("nameTagColor", 0); target.SetSharedData("nameTagColor", 0);
break; break;
case 8: case 8:
player.SetSharedData("nameTagColor", 8); target.SetSharedData("nameTagColor", 8);
break; break;
case 7: case 7:
player.SetSharedData("nameTagColor", 7); target.SetSharedData("nameTagColor", 7);
break; break;
case 4: case 4:
player.SetSharedData("nameTagColor", 4); target.SetSharedData("nameTagColor", 4);
break; break;
case 9: case 9:
player.SetSharedData("nameTagColor", 9); target.SetSharedData("nameTagColor", 9);
break; break;
} }
target.TriggerEvent("jailTime", 0); target.TriggerEvent("jailTime", 0);
if (targetUser.FactionId != null) player.SetSharedData("nameTagColor", targetUser.FactionId); if (targetUser.FactionId != null) target.SetSharedData("nameTagColor", targetUser.FactionId);
targetUser.Wanteds = 0; targetUser.Wanteds = 0;
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
@@ -2452,7 +2452,7 @@ namespace ReallifeGamemode.Server.Commands
{ {
case null: case null:
target.SetSharedData("blipColor", 0); target.SetSharedData("blipColor", 0);
player.SetSharedData("nameTagColor", 0); target.SetSharedData("nameTagColor", 0);
break; break;
case 0: case 0:
@@ -2475,7 +2475,7 @@ namespace ReallifeGamemode.Server.Commands
break; break;
} }
if (u.FactionId != null) player.SetSharedData("nameTagColor", u.FactionId); if (u.FactionId != null) target.SetSharedData("nameTagColor", u.FactionId);
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
} }
@@ -2522,7 +2522,7 @@ namespace ReallifeGamemode.Server.Commands
{ {
case null: case null:
target.SetSharedData("blipColor", 0); target.SetSharedData("blipColor", 0);
player.SetSharedData("nameTagColor", 0); target.SetSharedData("nameTagColor", 0);
break; break;
case 8: case 8:
@@ -2540,7 +2540,7 @@ namespace ReallifeGamemode.Server.Commands
target.SetSharedData("blipColor", 25); target.SetSharedData("blipColor", 25);
break; break;
} }
if (u.FactionId != null) player.SetSharedData("nameTagColor", u.FactionId); if (u.FactionId != null) target.SetSharedData("nameTagColor", u.FactionId);
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
} }

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

@@ -51,13 +51,13 @@ namespace ReallifeGamemode.Server.Commands
ChatService.NotAuthorized(player); ChatService.NotAuthorized(player);
return; return;
} }
if (f.Name == "Ballas" || f.Name == "Grove" || user.IsAdmin(AdminLevel.ADMIN)) if (f?.Name == "Ballas" || f?.Name == "Grove" || user.IsAdmin(AdminLevel.ADMIN))
{ {
message = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", ""); message = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", "");
string rank = string.Empty; string rank = string.Empty;
if(f.Name == "Ballas" || f.Name == "Grove") if(f?.Name == "Ballas" || f?.Name == "Grove")
{ {
rank = player.GetUser().GetFactionRank().RankName; rank = player.GetUser().GetFactionRank().RankName;
} }