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

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
Lukas Moungos
2021-04-05 15:33:15 +02:00
parent 8043f3c35b 8a9473083f
commit 90514a381d
3 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1578,7 +1578,7 @@ namespace ReallifeGamemode.Server.Commands
return; return;
} }
Vehicle v = NAPI.Vehicle.CreateVehicle(uHash, player.Position, player.Rotation.Z, color1, color2, engine: true); Vehicle v = NAPI.Vehicle.CreateVehicle(uHash, player.Position, player.Heading, color1, color2, engine: true);
VehicleStreaming.SetEngineState(v, true); VehicleStreaming.SetEngineState(v, true);
VehicleStreaming.SetLockStatus(v, false); VehicleStreaming.SetLockStatus(v, false);
player.SetIntoVehicle(v.Handle, 0); player.SetIntoVehicle(v.Handle, 0);

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

@@ -292,16 +292,15 @@ namespace ReallifeGamemode.Server.Commands
if (player.IsInVehicle) if (player.IsInVehicle)
{ {
ChatService.ErrorMessage(player, "Du kannst in einem Auto nicht wiederbeleben."); ChatService.ErrorMessage(player, "Du kannst in einem Auto nicht wiederbeleben");
return; return;
} }
using var dbContext = new DatabaseContext();
var nearPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(4, player); var nearPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(4, player);
var deadPlayer = nearPlayers.Where(i => i.GetData<bool>("isDead") == true).FirstOrDefault(); var deadPlayer = nearPlayers.Where(i => i.GetData<bool>("isDead") == true).FirstOrDefault();
if (player == deadPlayer) if (player == deadPlayer)
{ {
ChatService.ErrorMessage(player, "Du kannst dich nicht selbst wiederbeleben."); ChatService.ErrorMessage(player, "Du kannst dich nicht selbst wiederbeleben");
return; return;
} }
@@ -310,35 +309,33 @@ namespace ReallifeGamemode.Server.Commands
ChatService.ErrorMessage(player, "Es wurde kein toter Spieler gefunden"); ChatService.ErrorMessage(player, "Es wurde kein toter Spieler gefunden");
return; return;
} }
using (var dbContext = new DatabaseContext())
var deadPlayerUser = deadPlayer.GetUser(dbContext);
if (deadPlayerUser.Handmoney >= 100)
{ {
deadPlayerUser.Handmoney -= 100; var deadPlayerUser = deadPlayer.GetUser(dbContext);
}
else
{
int bankMoney = 100 - deadPlayerUser.Handmoney;
deadPlayerUser.Handmoney = 0;
deadPlayerUser.BankAccount.Balance -= bankMoney;
}
dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += Medic.ReviveIncome; if (deadPlayerUser.Handmoney >= 100)
{
deadPlayerUser.Handmoney -= 100;
}
else
{
int bankMoney = 100 - deadPlayerUser.Handmoney;
deadPlayerUser.Handmoney = 0;
deadPlayerUser.BankAccount.Balance -= bankMoney;
}
dbContext.SaveChanges(); player.PlayAnimation("amb@medic@standing@kneel@enter", "enter", 0);
player.PlayAnimation("amb@medic@standing@kneel@enter", "enter", 0); deadPlayer.TriggerEvent("onPlayerRevived");
player.TriggerEvent("destroyMedicTaskCheckpoint");
deadPlayer.SendNotification($"Du wurdest von ~y~{player.Name}~s~ für ~g~{100.ToMoneyString()} ~s~wiederbelebt.");
player.SendNotification($"Du hast ~y~{deadPlayer.Name}~s~ wiederbelebt und ~g~{Medic.ReviveIncome}$ ~s~für die Fraktion verdient.");
deadPlayer.SetData("isDead", false);
dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 2).First().BankAccount.Balance += Medic.ReviveIncome;
deadPlayer.TriggerEvent("onPlayerRevived");
player.TriggerEvent("destroyMedicTaskCheckpoint");
deadPlayer.SendNotification($"Du wurdest von ~y~{player.Name}~s~ für ~g~{100.ToMoneyString()} ~s~wiederbelebt.");
player.SendNotification($"Du hast ~y~{deadPlayer.Name}~s~ wiederbelebt und ~g~{Medic.ReviveIncome}$ ~s~für die Fraktion verdient.");
deadPlayer.SetData("isDead", false);
using (var dbContext1 = new DatabaseContext())
{
User u; User u;
u = deadPlayer.GetUser(dbContext1); u = deadPlayer.GetUser(dbContext);
u.Dead = false; u.Dead = false;
dbContext.SaveChanges(); dbContext.SaveChanges();
} }

2
ReallifeGamemode.Server/Inventory/GroundItem.cs
View File

@@ -39,7 +39,7 @@ namespace ReallifeGamemode.Server.Inventory
UserItem existingItem = InventoryManager.UserHasThisItem(player, nearest.ItemId); UserItem existingItem = InventoryManager.UserHasThisItem(player, nearest.ItemId);
var user = player.GetUser(); var user = player.GetUser();
if (player.HasAttachment("ammobox")) if (player.HasAttachment("ammobox"))
{ player.SendNotification("~r~Du kannst momentan nichts tragen!", false); return; } { player.SendNotification("~r~Du kannst momentan nichts tragen!", false); return false; }
if (nearestItem.Gewicht * nearest.Amount + invWeight > 40000) if (nearestItem.Gewicht * nearest.Amount + invWeight > 40000)
{ {
for (var i = 1; i <= nearest.Amount; i++) for (var i = 1; i <= nearest.Amount; i++)