diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..3c3559de --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.rpf filter=lfs diff=lfs merge=lfs -text diff --git a/Client/Tuning/sync.js b/Client/Tuning/sync.js new file mode 100644 index 00000000..24baf472 --- /dev/null +++ b/Client/Tuning/sync.js @@ -0,0 +1,4 @@ +mp.events.add('entityStreamIn', (entity) => { + mp.gui.chat.push("streamed in:"); + mp.gui.chat.push(entity.Model); +}); \ No newline at end of file diff --git a/Client/dlcpacks/map_improvement/dlc.rpf b/Client/dlcpacks/map_improvement/dlc.rpf new file mode 100644 index 00000000..2226f873 --- /dev/null +++ b/Client/dlcpacks/map_improvement/dlc.rpf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4583d08eb98355d8640aac132b305e16504c9886fbd319aa44f10c3b7b099987 +size 13824 diff --git a/Client/index.js b/Client/index.js index cf5f0946..7a5fa58a 100644 --- a/Client/index.js +++ b/Client/index.js @@ -34,5 +34,6 @@ require('./Save/main.js'); require('./Speedometer/index.js'); require('./Tuning/main.js'); +require('./Tuning/sync.js'); require('./Business/main.js'); diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index 9f789bcf..0b425734 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -1043,8 +1043,7 @@ namespace reallife_gamemode.Server.Commands return; } - if (mod == -1) player.Vehicle.RemoveMod(slot); - else player.Vehicle.SetMod(slot, mod); + player.Vehicle.SetMod(slot, mod); } [Command("aneon", "~m~Benutzung: ~s~/aneon [R][G][B]")] diff --git a/Server/Events/Disconnect.cs b/Server/Events/Disconnect.cs index 1811d970..c200b6b9 100644 --- a/Server/Events/Disconnect.cs +++ b/Server/Events/Disconnect.cs @@ -36,19 +36,17 @@ namespace reallife_gamemode.Server.Events using (var saveUser = new Model.DatabaseContext()) { var user = player.GetUser(saveUser); + Vector3 pos = player.Position; - if(user == null) + if(!float.IsNaN(pos.X) && !float.IsNaN(pos.Y) && !float.IsNaN(pos.Z)) { - return; - } - else - { - user.PositionX = player.Position.X; - user.PositionY = player.Position.Y; - user.PositionZ = player.Position.Z; - user.Dead = player.GetData("isDead"); + user.PositionX = pos.X; + user.PositionY = pos.Y; + user.PositionZ = pos.Z; saveUser.SaveChanges(); - } + } + + user.Dead = player.HasData("isDead") ? player.GetData("isDead") : false; } player.SetData("isLoggedIn", false); } diff --git a/Server/Managers/LoadManager.cs b/Server/Managers/LoadManager.cs index 7d7737e6..651d34c6 100644 --- a/Server/Managers/LoadManager.cs +++ b/Server/Managers/LoadManager.cs @@ -46,8 +46,6 @@ namespace reallife_gamemode.Server.Managers tLabel.AttachTo(current, "chassis", new Vector3(0, 0, 1.5), new Vector3(0, 0, 0)); } } - - } } } diff --git a/Server/Managers/VehicleManager.cs b/Server/Managers/VehicleManager.cs index d03ae2eb..6359dbd3 100644 --- a/Server/Managers/VehicleManager.cs +++ b/Server/Managers/VehicleManager.cs @@ -11,7 +11,7 @@ namespace reallife_gamemode.Server.Managers { private static readonly List _enabledMods = new List() { - + "polamggtr" }; private static Dictionary _serverVehicles = new Dictionary();