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

This commit is contained in:
2021-04-11 02:22:02 +02:00
2 changed files with 2 additions and 2 deletions

View File

@@ -692,7 +692,7 @@ namespace ReallifeGamemode.Server.Commands
{ {
Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y - value, player.Position.Z); Vector3 playerPosition = new Vector3(player.Position.X, player.Position.Y - value, player.Position.Z);
if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition; if (player.IsInVehicle && player.VehicleSeat == 0) player.Vehicle.Position = playerPosition;
elseplayer.SafeTeleport(playerPosition); else player.SafeTeleport(playerPosition);
} }
else if (playerHeading >= 135 && playerHeading < 225) else if (playerHeading >= 135 && playerHeading < 225)
{ {

View File

@@ -185,7 +185,7 @@ namespace ReallifeGamemode.Server.Wanted
player.Health = 100; player.Health = 100;
player.SafeTeleport(new Vector3(427.879, -984.65, 30.71)); player.SafeTeleport(new Vector3(427.879, -984.65, 30.71));
ChatService.HQMessage("!{#8181E9}HQ: Beamter " + cop.Name + " hat " + user.Name + " aus dem Knast entlassen."); ChatService.HQMessage("Beamter " + cop.Name + " hat " + user.Name + " aus dem Knast entlassen.");
ChatService.SendMessage(player, "!{#8181E9}Der Beamte " + cop.Name + " hat dich aus dem Knast entlassen"); ChatService.SendMessage(player, "!{#8181E9}Der Beamte " + cop.Name + " hat dich aus dem Knast entlassen");
player.TriggerEvent("jailTime", 0); player.TriggerEvent("jailTime", 0);
} }