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

RAGE Multiplayer 1.1.0-DP Update

Browse Source 
/freeze was obselete and removed
/unfreeze was obselete and removed
/spectate was obselete and removed
This commit is contained in:
Siga
2020-02-24 21:18:54 +01:00
parent 0d5731fb11
commit edf06f4478
85 changed files with 804 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ReallifeGamemode.Server/Managers/HouseManager.cs
View File

@@ -12,14 +12,14 @@ using System.Text;
namespace ReallifeGamemode.Server.Managers
{
class HouseManager : Script
class HouseManager
{
private static readonly Dictionary<int, NetHandle> houseMarkers = new Dictionary<int, NetHandle>();
private static readonly Dictionary<int, NetHandle> houseLabels = new Dictionary<int, NetHandle>();
private static readonly Dictionary<int, NetHandle> houseColShapes = new Dictionary<int, NetHandle>();
private static readonly Dictionary<int, NetHandle> houseBlips = new Dictionary<int, NetHandle>();
private static readonly Dictionary<int, List<Client>> playerInColShape = new Dictionary<int, List<Client>>();
private static readonly Dictionary<int, List<Player>> playerInColShape = new Dictionary<int, List<Player>>();
public static async void LoadHouses()
{
@@ -99,7 +99,7 @@ namespace ReallifeGamemode.Server.Managers
{
if (loadUser) house = house.Refresh();
playerInColShape[house.Id] = new List<Client>();
playerInColShape[house.Id] = new List<Player>();
houseMarkers[house.Id] = NAPI.Marker.CreateMarker(MarkerType.VerticalCylinder, house.Position.Subtract(new Vector3(0, 0, 1.7)), new Vector3(), new Vector3(), 1.6f, new Color(255, 255, 255));
string text = $"~g~Zum Verkauf\n~s~{house.Type}\nPreis: ~y~{(house.Price == 0 ? "~r~Nicht verkäuflich" : house.Price.ToMoneyString())}";
@@ -127,7 +127,7 @@ namespace ReallifeGamemode.Server.Managers
}
}
private static void HouseManager_OnEntityExitColShape(ColShape colShape, Client client)
private static void HouseManager_OnEntityExitColShape(ColShape colShape, Player client)
{
if (!client.IsLoggedIn() || client.IsInVehicle) return;
if (!houseColShapes.ContainsValue(colShape.Handle))
@@ -140,7 +140,7 @@ namespace ReallifeGamemode.Server.Managers
client.TriggerEvent("SERVER:CloseHouseMenu");
}
private static void HouseManager_OnEntityEnterColShape(ColShape colShape, Client client)
private static void HouseManager_OnEntityEnterColShape(ColShape colShape, Player client)
{
if (!client.IsLoggedIn() || client.IsInVehicle) return;
if (!houseColShapes.ContainsValue(colShape.Handle))
@@ -153,10 +153,10 @@ namespace ReallifeGamemode.Server.Managers
User user = client.GetUser();
client.TriggerEvent("SERVER:ShowHouseMenu");
SendClientHouseData(client, house);
SendPlayerHouseData(client, house);
}
private static void SendClientHouseData(Client player, House house)
private static void SendPlayerHouseData(Player player, House house)
{
User user = player.GetUser();
var userHouseStatus = -1;
@@ -208,14 +208,14 @@ namespace ReallifeGamemode.Server.Managers
houseBlips.Remove(house.Id);
}
foreach (Client client in playerInColShape[house.Id])
foreach (Player client in playerInColShape[house.Id])
{
client.TriggerEvent("SERVER:CloseHouseMenu");
}
}
[RemoteEvent("CLIENT:House_BuyHouse")]
public void HouseManagerBuyHouseEvent(Client player)
public void HouseManagerBuyHouseEvent(Player player)
{
using (var dbContext = new DatabaseContext())
{
@@ -250,7 +250,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:House_SetRentalFee")]
public void HouseManagerSetRentalFeeEvent(Client player, int rentalFee)
public void HouseManagerSetRentalFeeEvent(Player player, int rentalFee)
{
using (var dbContext = new DatabaseContext())
{
@@ -276,7 +276,7 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("CLIENT:House_CancelUserRental")]
public void HouseManagerCancelUserRentalEvent(Client player, string userName)
public void HouseManagerCancelUserRentalEvent(Player player, string userName)
{
using (var dbContext = new DatabaseContext())
{
@@ -306,15 +306,15 @@ namespace ReallifeGamemode.Server.Managers
dbContext.HouseRentals.Remove(rental);
dbContext.SaveChanges();
target.Client?.SendNotification($"~y~{player.Name}~s~ hat deinen Mietvertrag ~g~gekündigt~s~.");
target.Player?.SendNotification($"~y~{player.Name}~s~ hat deinen Mietvertrag ~g~gekündigt~s~.");
player.SendNotification("Du hast dem Spieler ~y~" + target.Name + "~s~ den Mietvertrag gekündigt.");
SendClientHouseData(player, house);
SendPlayerHouseData(player, house);
}
}
[RemoteEvent("CLIENT:House_RentInHouse")]
public void HouseManagerRentInHouseEvent(Client player)
public void HouseManagerRentInHouseEvent(Player player)
{
using (var dbContext = new DatabaseContext())
{
@@ -340,12 +340,12 @@ namespace ReallifeGamemode.Server.Managers
player.SendNotification("~g~Du hast dich in das Haus eingemietet");
house.User?.SendNotification($"~y~{player.Name}~s~ hat sich in dein Haus eingemietet.");
SendClientHouseData(player, house);
SendPlayerHouseData(player, house);
}
}
[RemoteEvent("CLIENT:House_CancelOwnRental")]
public void HouseManagerCancelOwnRentalEvent(Client player)
public void HouseManagerCancelOwnRentalEvent(Player player)
{
using (var dbContext = new DatabaseContext())
{
@@ -376,12 +376,12 @@ namespace ReallifeGamemode.Server.Managers
RemoveHouse(house);
LoadHouse(house);
SendClientHouseData(player, house);
SendPlayerHouseData(player, house);
}
}
[RemoteEvent("CLIENT:House_SellHouse")]
public void HouseManagerSellHouseEvent(Client player)
public void HouseManagerSellHouseEvent(Player player)
{
using (var dbContext = new DatabaseContext())
{
@@ -404,7 +404,7 @@ namespace ReallifeGamemode.Server.Managers
RemoveHouse(house);
LoadHouse(house);
SendClientHouseData(player, house);
SendPlayerHouseData(player, house);
}
}
}