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

fix

Browse Source
This commit is contained in:
hydrant
2020-03-29 17:36:58 +02:00
parent bcfc2105ea
commit 1871a97122
5 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ReallifeGamemode.Database/Entities/User.cs
View File

@@ -107,7 +107,14 @@ namespace ReallifeGamemode.Database.Entities
}
[NotMapped]
public IPlayer NewPlayer => new RagePlayer(Player);
public IPlayer NewPlayer
{
get
{
if (Player != null) return new RagePlayer(Player);
return null;
}
}
public override string BankAccountName => Name;
}

2
ReallifeGamemode.Server.Core.API/IPlayer.cs
View File

@@ -24,7 +24,7 @@ namespace ReallifeGamemode.Server.Core.API
void SendMessage(string message, ChatPrefix prefix = ChatPrefix.None)
{
if (!message.EndsWith("!") || !message.EndsWith(".") || !message.EndsWith("?"))
if (!message.EndsWith("!") && !message.EndsWith(".") && !message.EndsWith("?"))
{
message += prefix switch
{

2
ReallifeGamemode.Server.Core.RageMP/RageAPI.cs
View File

@@ -20,7 +20,7 @@ namespace ReallifeGamemode.Server.Core.RageMP
public void DisableDefaultCommandErrorMessages()
{
NAPI.Server.SetCommandErrorMessage(null);
NAPI.Server.SetCommandErrorMessage(string.Empty);
//NAPI.Server.SetGlobalDefaultCommandMessages(false);
}

32
ReallifeGamemode.Server.Core.RageMP/RagePlayer.cs
View File

@@ -13,22 +13,28 @@ namespace ReallifeGamemode.Server.Core.RageMP
public string Name
{
get => client.Name;
set => client.Name = value;
get => client?.Name;
set
{
if (client != null)
{
client.Name = value;
}
}
}
public string SocialClubName => client.SocialClubName;
public string SocialClubName => client?.SocialClubName;
public IPAddress RemoteAddress => IPAddress.Parse(client.Address);
public IPAddress RemoteAddress => IPAddress.Parse(client?.Address);
public IVehicle Vehicle => client.IsInVehicle ? new RageVehicle(client.Vehicle) : null;
public IVehicle Vehicle => client != null ? (client.IsInVehicle ? new RageVehicle(client?.Vehicle) : null) : null;
public VehicleSeat VehicleSeat => (VehicleSeat)client.VehicleSeat;
public VehicleSeat VehicleSeat => (VehicleSeat)client?.VehicleSeat;
public bool IsInVehicle => Vehicle != null;
public int Health { get => client.Health; set => client.Health = value; }
public int Armor { get => client.Armor; set => client.Armor = value; }
public int Health { get => client?.Health ?? 0; set { if (client != null) client.Health = value; } }
public int Armor { get => client?.Armor ?? 0; set { if (client != null) client.Armor = value; } }
public RagePlayer(GTANetworkAPI.Player client) : base(client)
{
@@ -37,20 +43,20 @@ namespace ReallifeGamemode.Server.Core.RageMP
public void SendRawMessage(string message)
{
client.SendChatMessage(message);
client?.SendChatMessage(message);
}
public void TriggerEventRaw(string eventName, params object[] args)
{
client.TriggerEvent(eventName, args);
client?.TriggerEvent(eventName, args);
}
public void SetIntoVehicle(IVehicle vehicle, VehicleSeat seat)
{
client.SetIntoVehicle(new GTANetworkAPI.NetHandle((ushort)vehicle.Handle, GTANetworkAPI.EntityType.Vehicle), (int)seat - 1);
client?.SetIntoVehicle(new GTANetworkAPI.NetHandle((ushort)vehicle.Handle, GTANetworkAPI.EntityType.Vehicle), (int)seat - 1);
}
public void Kick() => client.Kick();
public void Kick() => client?.Kick();
public void SendNotification(string message, bool flashing = true)
{
@@ -73,7 +79,7 @@ namespace ReallifeGamemode.Server.Core.RageMP
public void CancelAnimation()
{
client.StopAnimation();
client?.StopAnimation();
}
}
}

2
ReallifeGamemode.Server/Main.cs
View File

@@ -64,7 +64,7 @@ namespace ReallifeGamemode.Server
NAPI.Server.SetGlobalServerChat(false);
NAPI.Server.SetCommandErrorMessage("~r~[FEHLER]~s~ Dieser Command existiert nicht.");
//NAPI.Server.SetCommandErrorMessage("~r~[FEHLER]~s~ Dieser Command existiert nicht.");
NAPI.Server.SetDefaultSpawnLocation(DEFAULT_SPAWN_POSITION, DEFAULT_SPAWN_HEADING);
NAPI.Server.SetAutoSpawnOnConnect(false);
NAPI.Server.SetAutoRespawnAfterDeath(false);