Fix Revive not setting DB MERGE

This commit is contained in:
VegaZ
2021-04-05 15:08:57 +02:00
2 changed files with 2 additions and 2 deletions

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);

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++)