Update to SHVDN nightly (#70)

world limits will be applied to all players instead
Fix explosions when remote and local vehicles exist at same position
Fix "floating corpses" issue when remote NPCs are killed

RageCoop.Client/Debug.cs

@@ -43,7 +43,7 @@ namespace RageCoop.Client
         public static void ShowTimeStamps()
         {
             GTA.UI.Notification.Hide(_lastNfHandle);
-            _lastNfHandle = GTA.UI.Notification.Show(Debug.TimeStamps.Dump());
+            _lastNfHandle = GTA.UI.Notification.PostTicker(TimeStamps.Dump(), false).Handle;
 
         }
     }

RageCoop.Client/DevTools/DevTool.cs

@@ -162,7 +162,7 @@ namespace RageCoop.Client
                 thread.SetApartmentState(ApartmentState.STA);
                 thread.Start();
                 thread.Join();
-                GTA.UI.Notification.Show("Copied to clipboard, please paste it on the GitHub issue page!");
+                GTA.UI.Notification.PostTicker("Copied to clipboard, please paste it on the GitHub issue page!", false);
             }
         }
 

RageCoop.Client/Main.cs

@@ -53,7 +53,7 @@ namespace RageCoop.Client
             }
             catch
             {
-                GTA.UI.Notification.Show("Malformed configuration, overwriting with default values...");
+                GTA.UI.Notification.PostTicker("Malformed configuration, overwriting with default values...", false);
                 Settings = new Settings();
                 Util.SaveSettings();
             }
@@ -79,7 +79,7 @@ namespace RageCoop.Client
                     }
                     if (!_gameLoaded)
                     {
-                        GTA.UI.Notification.Show("~r~Please update your GTA5 to v1.0.1290 or newer!", true);
+                        GTA.UI.Notification.PostTicker("~r~Please update your GTA5 to v1.0.1290 or newer!", true);
                         _gameLoaded = true;
                     }
                 };
@@ -117,7 +117,7 @@ namespace RageCoop.Client
             else if (!_gameLoaded && (_gameLoaded = true))
             {
 #if !NON_INTERACTIVE
-                GTA.UI.Notification.Show(GTA.UI.NotificationIcon.AllPlayersConf, "RAGECOOP", "Welcome!", $"Press ~g~{Main.Settings.MenuKey}~s~ to open the menu.");
+                GTA.UI.Notification.PostMessageText($"Press ~g~{Settings.MenuKey}~s~ to open the menu.", new GTA.Graphics.TextureAsset("CHAR_ALL_PLAYERS_CONF", "CHAR_ALL_PLAYERS_CONF"), false, GTA.UI.FeedTextIcon.Message, "RAGECOOP", "Welcome!");
 #endif
             }
 
@@ -304,7 +304,7 @@ namespace RageCoop.Client
                 Function.Call(Hash.SET_ENABLE_VEHICLE_SLIPSTREAMING, true);
                 CoopMenu.ConnectedMenuSetting();
                 MainChat.Init();
-                GTA.UI.Notification.Show("~g~Connected!");
+                GTA.UI.Notification.PostTicker("~g~Connected!", false);
             });
 
             Logger.Info(">> Connected <<");
@@ -327,7 +327,7 @@ namespace RageCoop.Client
                 Function.Call(Hash.SET_ENABLE_VEHICLE_SLIPSTREAMING, false);
                 CoopMenu.DisconnectedMenuSetting();
                 if (reason != "Abort")
-                    GTA.UI.Notification.Show("~r~Disconnected: " + reason);
+                    GTA.UI.Notification.PostTicker("~r~Disconnected: " + reason, false);
                 LocalPlayerID = default;
             });
             Memory.RestorePatches();

RageCoop.Client/Menus/CoopMenu.cs

@@ -99,7 +99,7 @@ namespace RageCoop.Client.Menus
                 Game.DisableAllControlsThisFrame();
                 MenuPool.Process();
 
-                var scaleform = new Scaleform("instructional_buttons");
+                var scaleform = Scaleform.RequestMovie("instructional_buttons");
                 scaleform.CallFunction("CLEAR_ALL");
                 scaleform.CallFunction("TOGGLE_MOUSE_BUTTONS", 0);
                 scaleform.CallFunction("CREATE_CONTAINER");

RageCoop.Client/Menus/Sub/ServersMenu.cs

@@ -85,7 +85,7 @@ namespace RageCoop.Client.Menus
                             if (server.useZT)
                             {
                                 address = $"{server.ztAddress}:{server.port}";
-                                Notification.Show($"~y~Joining ZeroTier network... {server.ztID}");
+                                Notification.PostTicker($"~y~Joining ZeroTier network... {server.ztID}", false);
                                 if (ZeroTierHelper.Join(server.ztID) == null)
                                 {
                                     throw new Exception("Failed to obtain ZeroTier network IP");
@@ -102,10 +102,10 @@ namespace RageCoop.Client.Menus
                         }
                         catch (Exception ex)
                         {
-                            Notification.Show($"~r~{ex.Message}");
+                            Notification.PostTicker($"~r~{ex.Message}", false);
                             if (server.useZT)
                             {
-                                Notification.Show($"Make sure ZeroTier is correctly installed, download it from https://www.zerotier.com/");
+                                Notification.PostTicker($"Make sure ZeroTier is correctly installed, download it from https://www.zerotier.com/", false);
                             }
                         }
                     };

RageCoop.Client/Menus/Sub/SettingsMenu.cs

@@ -24,6 +24,7 @@ namespace RageCoop.Client.Menus
         private static readonly NativeItem _menuKey = new NativeItem("Menu Key", "The key to open menu", Main.Settings.MenuKey.ToString());
         private static readonly NativeItem _passengerKey = new NativeItem("Passenger Key", "The key to enter a vehicle as passenger", Main.Settings.PassengerKey.ToString());
         private static readonly NativeItem _vehicleSoftLimit = new NativeItem("Vehicle limit (soft)", "The game won't spawn more NPC traffic if the limit is exceeded. \n-1 for unlimited (not recommended).", Main.Settings.WorldVehicleSoftLimit.ToString());
+        private static readonly NativeItem _pedSoftLimit = new NativeItem("Ped limit (soft)", "The game won't spawn more NPCs if the limit is exceeded. \n-1 for unlimited (not recommended).", Main.Settings.WorldPedSoftLimit.ToString());
 
         static SettingsMenu()
         {
@@ -37,6 +38,7 @@ namespace RageCoop.Client.Menus
             _menuKey.Activated += ChaneMenuKey;
             _passengerKey.Activated += ChangePassengerKey;
             _vehicleSoftLimit.Activated += VehicleSoftLimitActivated;
+            _pedSoftLimit.Activated += PedSoftLimitActivated;
             _showBlip.Activated += (s, e) =>
             {
                 Main.Settings.ShowPlayerBlip = _showBlip.Checked;
@@ -55,6 +57,7 @@ namespace RageCoop.Client.Menus
             Menu.Add(_menuKey);
             Menu.Add(_passengerKey);
             Menu.Add(_vehicleSoftLimit);
+            Menu.Add(_pedSoftLimit);
             Menu.Add(_showBlip);
             Menu.Add(_showNametag);
         }
@@ -89,7 +92,19 @@ namespace RageCoop.Client.Menus
                 Main.Settings.WorldVehicleSoftLimit = int.Parse(
                     Game.GetUserInput(WindowTitle.EnterMessage20,
                     Main.Settings.WorldVehicleSoftLimit.ToString(), 20));
-                _menuKey.AltTitle = Main.Settings.WorldVehicleSoftLimit.ToString();
+                _vehicleSoftLimit.AltTitle = Main.Settings.WorldVehicleSoftLimit.ToString();
+                Util.SaveSettings();
+            }
+            catch { }
+        }
+        private static void PedSoftLimitActivated(object sender, EventArgs e)
+        {
+            try
+            {
+                Main.Settings.WorldPedSoftLimit = int.Parse(
+                    Game.GetUserInput(WindowTitle.EnterMessage20,
+                    Main.Settings.WorldPedSoftLimit.ToString(), 20));
+                _pedSoftLimit.AltTitle = Main.Settings.WorldPedSoftLimit.ToString();
                 Util.SaveSettings();
             }
             catch { }

RageCoop.Client/Networking/Chat.cs

@@ -31,6 +31,7 @@ namespace RageCoop.Client
         }
 
         private ulong LastMessageTime { get; set; }
+        private Keys LastKey { get; set; }
 
         private bool CurrentHidden { get; set; }
         private bool Hidden
@@ -56,7 +57,7 @@ namespace RageCoop.Client
 
         public Chat()
         {
-            MainScaleForm = new Scaleform("multiplayer_chat");
+            MainScaleForm = Scaleform.RequestMovie("multiplayer_chat");
         }
 
         public void Init()
@@ -115,6 +116,10 @@ namespace RageCoop.Client
                 MainScaleForm.CallFunction("PAGE_DOWN");
             }
 
+            if (key == Keys.Menu && LastKey == Keys.ShiftKey)
+                ActivateKeyboardLayout(1, 0);
+            LastKey = key;
+
             string keyChar = GetCharFromKey(key, Game.IsKeyPressed(Keys.ShiftKey), false);
 
             if (keyChar.Length == 0)
@@ -174,5 +179,8 @@ namespace RageCoop.Client
             ToUnicodeEx((uint)key, 0, keyboardState, buf, 256, 0, InputLanguage.CurrentInputLanguage.Handle);
             return buf.ToString();
         }
+
+        [DllImport("user32.dll")]
+        public static extern int ActivateKeyboardLayout(int hkl, uint flags);
     }
 }

RageCoop.Client/Networking/Networking.cs

@@ -34,7 +34,7 @@ namespace RageCoop.Client
             {
                 _publicKeyReceived.Set();
                 IsConnecting = false;
-                Main.QueueAction(() => Notification.Show("Connection has been canceled"));
+                Main.QueueAction(() => Notification.PostTicker("Connection has been canceled", false));
                 Peer?.Shutdown("Bye");
             }
             else if (IsOnServer)
@@ -104,7 +104,7 @@ namespace RageCoop.Client
 #endif
                             }
                         };
-                        Main.QueueAction(() => { Notification.Show($"~y~Trying to connect..."); });
+                        Main.QueueAction(() => { Notification.PostTicker($"~y~Trying to connect...", false); });
                         Menus.CoopMenu._serverConnectItem.Enabled = false;
                         Security.Regen();
                         if (publicKey == null)
@@ -139,7 +139,7 @@ namespace RageCoop.Client
                     catch (Exception ex)
                     {
                         Main.Logger.Error("Cannot connect to server: ", ex);
-                        Main.QueueAction(() => Notification.Show("Cannot connect to server: " + ex.Message));
+                        Main.QueueAction(() => Notification.PostTicker("Cannot connect to server: " + ex.Message, false));
                     }
                     IsConnecting = false;
                 });
@@ -159,7 +159,7 @@ namespace RageCoop.Client
 
             Main.Logger.Debug($"player connected:{p.Username}");
             Main.QueueAction(() =>
-            GTA.UI.Notification.Show($"~h~{p.Username}~h~ connected."));
+            Notification.PostTicker($"~h~{p.Username}~h~ connected.", false));
         }
         private static void PlayerDisconnect(Packets.PlayerDisconnect packet)
         {
@@ -169,7 +169,7 @@ namespace RageCoop.Client
             Main.QueueAction(() =>
             {
                 EntityPool.RemoveAllFromPlayer(packet.PedID);
-                GTA.UI.Notification.Show($"~h~{player.Username}~h~ left.");
+                Notification.PostTicker($"~h~{player.Username}~h~ left.", false);
             });
         }
 

RageCoop.Client/Networking/Receive.cs

@@ -3,6 +3,7 @@ using Lidgren.Network;
 using RageCoop.Client.Menus;
 using RageCoop.Core;
 using System;
+using System.Linq;
 using System.Threading;
 
 namespace RageCoop.Client
@@ -305,12 +306,15 @@ namespace RageCoop.Client
             SyncedPed c = EntityPool.GetPedByID(packet.ID);
             if (c == null)
             {
-                // Main.Logger.Debug($"Creating character for incoming sync:{packet.ID}");
-                if (EntityPool.allPeds.Length < Main.Settings.GlobalPedSoftLimit || PlayerList.Players.ContainsKey(packet.ID))
+                if (EntityPool.PedsByID.Count(x => x.Value.OwnerID == packet.OwnerID) < Main.Settings.WorldPedSoftLimit / PlayerList.Players.Count ||
+                    /*EntityPool.VehiclesByID.Any(x => x.Value.Position.DistanceTo(packet.Position) < 2) ||*/ // allows players to exceed the peds limit
+                    packet.ID == packet.OwnerID)
+                {
+                    // Main.Logger.Debug($"Creating character for incoming sync:{packet.ID}");
                     EntityPool.ThreadSafe.Add(c = new SyncedPed(packet.ID));
+                }
                 else return;
             }
-            PedDataFlags flags = packet.Flags;
             c.ID = packet.ID;
             c.OwnerID = packet.OwnerID;
             c.Health = packet.Health;
@@ -356,8 +360,12 @@ namespace RageCoop.Client
             SyncedVehicle v = EntityPool.GetVehicleByID(packet.ID);
             if (v == null)
             {
-                if (EntityPool.allVehicles.Length < Main.Settings.GlobalVehicleSoftLimit)
+                if (EntityPool.VehiclesByID.Count(x => x.Value.OwnerID == packet.OwnerID) < Main.Settings.WorldVehicleSoftLimit / PlayerList.Players.Count ||
+                    EntityPool.PedsByID.Any(x => x.Value.VehicleID == packet.ID || x.Value.Position.DistanceTo(packet.Position) < 2))
+                {
+                    // Main.Logger.Debug($"Creating vehicle for incoming sync:{packet.ID}");
                     EntityPool.ThreadSafe.Add(v = new SyncedVehicle(packet.ID));
+                }
                 else return;
             }
             if (v.IsLocal) { return; }
@@ -392,15 +400,12 @@ namespace RageCoop.Client
         }
         private static void ProjectileSync(Packets.ProjectileSync packet)
         {
-
             var p = EntityPool.GetProjectileByID(packet.ID);
             if (p == null)
             {
                 if (packet.Flags.HasProjDataFlag(ProjectileDataFlags.Exploded)) { return; }
                 // Main.Logger.Debug($"Creating new projectile: {(WeaponHash)packet.WeaponHash}");
-                if (EntityPool.allProjectiles.Length < Main.Settings.GlobalProjectileSoftLimit)
-                    EntityPool.ThreadSafe.Add(p = new SyncedProjectile(packet.ID));
-                else return;
+                EntityPool.ThreadSafe.Add(p = new SyncedProjectile(packet.ID));
             }
             p.Flags = packet.Flags;
             p.Position = packet.Position;

RageCoop.Client/Networking/Send.cs

@@ -126,7 +126,7 @@ namespace RageCoop.Client
             packet.Position = veh.ReadPosition();
             packet.Velocity = veh.Velocity;
             packet.Quaternion = veh.ReadQuaternion();
-            packet.RotationVelocity = veh.RotationVelocity;
+            packet.RotationVelocity = veh.LocalRotationVelocity;
             packet.ThrottlePower = veh.ThrottlePower;
             packet.BrakePower = veh.BrakePower;
             v.LastSentStopWatch.Restart();

RageCoop.Client/PlayerList.cs

@@ -13,7 +13,7 @@ namespace RageCoop.Client
     {
         private const float LEFT_POSITION = 0.122f;
         private const float RIGHT_POSITION = 0.9f;
-        private static readonly Scaleform _mainScaleform = new Scaleform("mp_mm_card_freemode");
+        private static readonly Scaleform _mainScaleform = Scaleform.RequestMovie("mp_mm_card_freemode");
         private static ulong _lastUpdate = Util.GetTickCount64();
         public static ulong Pressed { get; set; }
 

RageCoop.Client/Properties/AssemblyInfo.cs

@@ -16,7 +16,7 @@ using System.Resources;
 
 
 // Version information
-[assembly: AssemblyVersion("1.5.4.6")]
-[assembly: AssemblyFileVersion("1.5.4.6")]
+[assembly: AssemblyVersion("1.5.4.7")]
+[assembly: AssemblyFileVersion("1.5.4.7")]
 [assembly: NeutralResourcesLanguageAttribute( "en-US" )]
 

RageCoop.Client/Scripting/BaseScript.cs

@@ -31,7 +31,7 @@ namespace RageCoop.Client.Scripting
             API.RegisterCustomEventHandler(CustomEvents.UpdatePedBlip, UpdatePedBlip);
             API.RegisterCustomEventHandler(CustomEvents.IsHost, (e) => { _isHost = (bool)e.Args[0]; });
             API.RegisterCustomEventHandler(CustomEvents.WeatherTimeSync, WeatherTimeSync);
-            API.RegisterCustomEventHandler(CustomEvents.OnPlayerDied, (e) => { GTA.UI.Notification.Show((string)e.Args[0]); });
+            API.RegisterCustomEventHandler(CustomEvents.OnPlayerDied, (e) => { GTA.UI.Notification.PostTicker((string)e.Args[0], false); });
             Task.Run(() =>
             {
                 while (true)
@@ -42,12 +42,11 @@ namespace RageCoop.Client.Scripting
                         {
                             unsafe
                             {
-                                var time = World.CurrentTimeOfDay;
                                 int weather1 = default(int);
                                 int weather2 = default(int);
                                 float percent2 = default(float);
                                 Function.Call(Hash.GET_CURR_WEATHER_STATE, &weather1, &weather2, &percent2);
-                                API.SendCustomEvent(CustomEvents.WeatherTimeSync, time.Hours, time.Minutes, time.Seconds, weather1, weather2, percent2);
+                                API.SendCustomEvent(CustomEvents.WeatherTimeSync, GTA.Chrono.GameClock.Hour, GTA.Chrono.GameClock.Minute, GTA.Chrono.GameClock.Second, weather1, weather2, percent2);
                             }
                         });
                     }
@@ -59,7 +58,9 @@ namespace RageCoop.Client.Scripting
 
         private void WeatherTimeSync(CustomEventReceivedArgs e)
         {
-            World.CurrentTimeOfDay = new TimeSpan((int)e.Args[0], (int)e.Args[1], (int)e.Args[2]);
+            GTA.Chrono.GameClock.Hour = (int)e.Args[0];
+            GTA.Chrono.GameClock.Minute = (int)e.Args[1];
+            GTA.Chrono.GameClock.Second = (int)e.Args[2];
             Function.Call(Hash.SET_CURR_WEATHER_STATE, (int)e.Args[3], (int)e.Args[4], (float)e.Args[5]);
         }
 

RageCoop.Client/Settings.cs

@@ -68,21 +68,6 @@ namespace RageCoop.Client
         /// </summary>
         public int WorldPedSoftLimit { get; set; } = 30;
 
-        /// <summary>
-        /// The mod won't sync more vehicles if the limit is exceeded.
-        /// </summary>
-        public int GlobalVehicleSoftLimit { get; set; } = 100;
-
-        /// <summary>
-        /// The mod won't sync more peds if the limit is exceeded.
-        /// </summary>
-        public int GlobalPedSoftLimit { get; set; } = 100;
-
-        /// <summary>
-        /// The mod won't sync more projectiles if the limit is exceeded.
-        /// </summary>
-        public int GlobalProjectileSoftLimit { get; set; } = 100;
-
         /// <summary>
         /// The directory where log and resources downloaded from server will be placed.
         /// </summary>

RageCoop.Client/Sync/Entities/Ped/SyncedPed.cs

@@ -29,7 +29,7 @@ namespace RageCoop.Client
             OwnerID = Main.LocalPlayerID;
 
             //Function.Call(Hash.SET_PED_IS_IGNORED_BY_AUTO_OPEN_DOORS, false);
-            MainPed.SetConfigFlag((int)PedConfigFlags.CPED_CONFIG_FLAG_DisableHurt, true);
+            MainPed.SetConfigFlag(PedConfigFlagToggles.DisableHurt, true);
             // MainPed.SetConfigFlag((int)PedConfigFlags.CPED_CONFIG_FLAG_DisableMelee, true);
 
         }
@@ -141,6 +141,12 @@ namespace RageCoop.Client
                 }
             }
 
+            if (!IsPlayer && Health <= 0 && !MainPed.IsDead)
+            {
+                MainPed.Kill();
+                return;
+            }
+
             if (Speed >= 4)
             {
                 DisplayInVehicle();
@@ -205,7 +211,7 @@ namespace RageCoop.Client
                 MainPed = null;
             }
 
-            if (PedBlip != null && PedBlip.Exists())
+            if (PedBlip != null)
             {
                 PedBlip.Delete();
                 PedBlip = null;
@@ -239,16 +245,15 @@ namespace RageCoop.Client
             Function.Call(Hash.SET_PED_IS_IGNORED_BY_AUTO_OPEN_DOORS, false);
             Function.Call(Hash.SET_PED_CAN_EVASIVE_DIVE, MainPed.Handle, false);
 
-            MainPed.SetConfigFlag((int)PedConfigFlags.CPED_CONFIG_FLAG_DrownsInWater, false);
-            MainPed.SetConfigFlag((int)PedConfigFlags.CPED_CONFIG_FLAG_DisableHurt, true);
-            MainPed.SetConfigFlag((int)PedConfigFlags.CPED_CONFIG_FLAG_DisableExplosionReactions, true);
-            MainPed.SetConfigFlag((int)PedConfigFlags.CPED_CONFIG_FLAG_AvoidTearGas, false);
-            MainPed.SetConfigFlag((int)PedConfigFlags.CPED_CONFIG_FLAG_IgnoreBeingOnFire, true);
-            MainPed.SetConfigFlag((int)PedConfigFlags.CPED_CONFIG_FLAG_DisableEvasiveDives, true);
-            MainPed.SetConfigFlag((int)PedConfigFlags.CPED_CONFIG_FLAG_DisablePanicInVehicle, true);
-            MainPed.SetConfigFlag((int)PedConfigFlags.CPED_CONFIG_FLAG_BlockNonTemporaryEvents, true);
-            MainPed.SetConfigFlag((int)PedConfigFlags.CPED_CONFIG_FLAG_DisableShockingEvents, true);
-            MainPed.SetConfigFlag((int)PedConfigFlags.CPED_CONFIG_FLAG_DisableHurt, true);
+            MainPed.SetConfigFlag(PedConfigFlagToggles.DrownsInWater, false);
+            MainPed.SetConfigFlag(PedConfigFlagToggles.DisableHurt, true);
+            MainPed.SetConfigFlag(PedConfigFlagToggles.DisableExplosionReactions, true);
+            MainPed.SetConfigFlag(PedConfigFlagToggles.AvoidTearGas, false);
+            MainPed.SetConfigFlag(PedConfigFlagToggles.IgnoreBeingOnFire, true);
+            MainPed.SetConfigFlag(PedConfigFlagToggles.DisableEvasiveDives, true);
+            MainPed.SetConfigFlag(PedConfigFlagToggles.DisablePanicInVehicle, true);
+            MainPed.SetConfigFlag(PedConfigFlagToggles.BlockNonTemporaryEvents, true);
+            MainPed.SetConfigFlag(PedConfigFlagToggles.DisableShockingEvents, true);
 
             SetClothes();
 
@@ -420,7 +425,7 @@ namespace RageCoop.Client
             }
             _lastIsJumping = false;
 
-            if (IsRagdoll || Health == 0)
+            if (IsRagdoll || (IsPlayer && Health == 0))
             {
                 if (!MainPed.IsRagdoll)
                 {
@@ -540,7 +545,7 @@ namespace RageCoop.Client
         {
             if (Velocity == default)
             {
-                MainPed.Task.AimAt(AimCoords, 1000);
+                MainPed.Task.AimGunAtPosition(AimCoords, 1000);
             }
             else
             {

RageCoop.Client/Sync/Entities/Vehicle/SyncedVehicle.cs

@@ -4,6 +4,7 @@ using GTA.Native;
 using RageCoop.Core;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace RageCoop.Client
 {
@@ -141,7 +142,7 @@ namespace RageCoop.Client
 
             if (LightsOn != MainVehicle.AreLightsOn)
             {
-                MainVehicle.AreLightsOn = LightsOn;
+                MainVehicle.SetScriptedLightSetting(LightsOn ? ScriptedVehicleLightSetting.SetVehicleLightsOn : ScriptedVehicleLightSetting.SetVehicleLightsOff);
             }
 
             if (HighBeamsOn != MainVehicle.AreHighBeamsOn)
@@ -284,10 +285,10 @@ namespace RageCoop.Client
             if (IsFlipped || (calirot = GetCalibrationRotation()).Length() > 50)
             {
                 MainVehicle.Quaternion = Quaternion.Slerp(MainVehicle.ReadQuaternion(), Quaternion, 0.5f);
-                MainVehicle.RotationVelocity = RotationVelocity;
+                MainVehicle.LocalRotationVelocity = RotationVelocity;
                 return;
             }
-            MainVehicle.RotationVelocity = RotationVelocity + calirot * 0.2f;
+            MainVehicle.LocalRotationVelocity = RotationVelocity + calirot * 0.2f;
         }
         private Vector3 GetCalibrationRotation()
         {
@@ -307,6 +308,16 @@ namespace RageCoop.Client
         }
         private bool CreateVehicle()
         {
+            var existing = World.GetNearbyVehicles(Position, 2).ToList().FirstOrDefault();
+            if (existing != null && existing != MainVehicle)
+            {
+                if (EntityPool.VehiclesByHandle.ContainsKey(existing.Handle))
+                {
+                    EntityPool.RemoveVehicle(ID);
+                    return false;
+                }
+                existing.Delete();
+            }
             MainVehicle?.Delete();
             MainVehicle = Util.CreateVehicle(Model, Position);
             if (!Model.IsInCdImage)
@@ -337,41 +348,5 @@ namespace RageCoop.Client
             Model.MarkAsNoLongerNeeded();
             return true;
         }
-        #region -- PEDALING --
-        /*
-         * Thanks to @oldnapalm.
-         */
-
-        private string PedalingAnimDict()
-        {
-            switch ((VehicleHash)Model)
-            {
-                case VehicleHash.Bmx:
-                    return "veh@bicycle@bmx@front@base";
-                case VehicleHash.Cruiser:
-                    return "veh@bicycle@cruiserfront@base";
-                case VehicleHash.Scorcher:
-                    return "veh@bicycle@mountainfront@base";
-                default:
-                    return "veh@bicycle@roadfront@base";
-            }
-        }
-
-        private string PedalingAnimName(bool fast)
-        {
-            return fast ? "fast_pedal_char" : "cruise_pedal_char";
-        }
-
-        private void StartPedalingAnim(bool fast)
-        {
-            MainVehicle.Driver?.Task.PlayAnimation(PedalingAnimDict(), PedalingAnimName(fast), 8.0f, -8.0f, -1, AnimationFlags.Loop | AnimationFlags.Secondary, 1.0f);
-
-        }
-
-        private void StopPedalingAnim(bool fast)
-        {
-            MainVehicle.Driver.Task.ClearAnimation(PedalingAnimDict(), PedalingAnimName(fast));
-        }
-        #endregion
     }
 }

RageCoop.Client/Sync/EntityPool.cs

@@ -51,7 +51,7 @@ namespace RageCoop.Client
             PedsByID.Clear();
             PedsByHandle.Clear();
 
-            foreach (int id in new List<int>(VehiclesByID.Keys))
+            foreach (int id in VehiclesByID.Keys.ToArray())
             {
                 if (keepMine && (VehiclesByID[id].OwnerID == Main.LocalPlayerID)) { continue; }
                 RemoveVehicle(id);
@@ -359,22 +359,24 @@ namespace RageCoop.Client
             lock (PedsLock)
             {
                 AddPlayer();
+                var mainCharacters = new List<PedHash> { PedHash.Michael, PedHash.Franklin, PedHash.Franklin02, PedHash.Trevor };
 
                 foreach (Ped p in allPeds)
                 {
-                    SyncedPed c = GetPedByHandle(p.Handle);
-                    List<PedHash> mainCharacters = new List<PedHash> { PedHash.Michael, PedHash.Franklin, PedHash.Franklin02, PedHash.Trevor };
-                    if (c == null && p != Game.Player.Character && !mainCharacters.Contains((PedHash)p.Model.Hash))
+                    if (!PedsByHandle.ContainsKey(p.Handle) && p != Game.Player.Character && !mainCharacters.Contains((PedHash)p.Model.Hash))
                     {
-                        if (allPeds.Length > Main.Settings.WorldPedSoftLimit && p.PopulationType == EntityPopulationType.RandomAmbient && !p.IsInVehicle())
+                        if (PedsByID.Count(x => x.Value.IsLocal) > Main.Settings.WorldPedSoftLimit)
                         {
-                            p.Delete();
-                            continue;
+                            if (p.PopulationType == EntityPopulationType.RandomAmbient && !p.IsInVehicle())
+                            {
+                                p.Delete();
+                                continue;
+                            }
+                            if (p.PopulationType == EntityPopulationType.RandomScenario) continue;
                         }
                         // Main.Logger.Trace($"Creating SyncEntity for ped, handle:{p.Handle}");
-                        c = new SyncedPed(p);
 
-                        Add(c);
+                        Add(new SyncedPed(p));
                     }
                 }
 #if BENCHMARK
@@ -438,10 +440,9 @@ namespace RageCoop.Client
                 {
                     if (!VehiclesByHandle.ContainsKey(veh.Handle))
                     {
-                        if (allVehicles.Length > Main.Settings.WorldVehicleSoftLimit)
+                        if (VehiclesByID.Count(x => x.Value.IsLocal) > Main.Settings.WorldVehicleSoftLimit)
                         {
-                            var type = veh.PopulationType;
-                            if (type == EntityPopulationType.RandomAmbient || type == EntityPopulationType.RandomParked)
+                            if (veh.PopulationType == EntityPopulationType.RandomAmbient || veh.PopulationType == EntityPopulationType.RandomParked)
                             {
                                 foreach (var p in veh.Occupants)
                                 {

RageCoop.Client/Sync/SyncEvents.cs

@@ -135,7 +135,7 @@ namespace RageCoop.Client
                 _lastWeaponHash = weaponHash;
             }
             if (!_weaponAsset.IsLoaded) { _weaponAsset.Request(); }
-            World.ShootBullet(start, end, p, _weaponAsset, (int)p.GetWeaponDamage(weaponHash));
+            World.ShootSingleBullet(start, end, (int)p.GetWeaponDamage(weaponHash), _weaponAsset, p);
             Prop w;
             if (((w = p.Weapons.CurrentWeaponObject) != null) && (p.VehicleWeapon == VehicleWeaponHash.Invalid))
             {

RageCoop.Client/Util/Memory.cs

@@ -40,7 +40,7 @@ namespace RageCoop.Client
         {
             // Weapon/radio wheel slow-mo patch
             // Thanks @CamxxCore, https://github.com/CamxxCore/GTAVWeaponWheelMod
-            var result = NativeMemory.FindPattern("\x38\x51\x64\x74\x19", "xxxxx");
+            var result = MemScanner.FindPatternBmh("\x38\x51\x64\x74\x19", "xxxxx");
             if (result == null) { throw new NotSupportedException("Can't find memory pattern to patch weapon/radio slow-mo"); }
             var address = result + 26;
             address = address + *(int*)address + 4u;
@@ -91,7 +91,7 @@ namespace RageCoop.Client
             var foundOffsets = new List<int>(100);
             for (int i = 0; i <= range; i++)
             {
-                var val = NativeMemory.ReadFloat(start + i);
+                var val = MemDataMarshal.ReadFloat(start + i);
                 if (Math.Abs(val - toSearch) < tolerance)
                 {
                     foundOffsets.Add(i);

RageCoop.Client/Util/Util.cs

@@ -201,7 +201,7 @@ namespace RageCoop.Client
             return v;
         }
 
-        public static void ApplyForce(this Entity e, int boneIndex, Vector3 direction, Vector3 rotation = default(Vector3), ForceType forceType = ForceType.MaxForceRot2)
+        public static void ApplyForce(this Entity e, int boneIndex, Vector3 direction, Vector3 rotation = default(Vector3), ForceType forceType = ForceType.ExternalImpulse)
         {
             Function.Call(Hash.APPLY_FORCE_TO_ENTITY, e.Handle, forceType, direction.X, direction.Y, direction.Z, rotation.X, rotation.Y, rotation.Z, boneIndex, false, true, true, false, true);
         }
@@ -244,7 +244,7 @@ namespace RageCoop.Client
                 }
                 lineList.Add("ReloadKey=Insert");
                 File.WriteAllLines("ScriptHookVDotNet.ini", lineList.ToArray());
-                GTA.UI.Notification.Show("Reload cannot be performed automatically, please type \"Reload()\" manually in the SHVDN console.");
+                GTA.UI.Notification.PostTicker("Reload cannot be performed automatically, please type \"Reload()\" manually in the SHVDN console.", false);
             }
             Keys key = (Keys)Enum.Parse(typeof(Keys), reloadKey, true);
 
@@ -259,7 +259,7 @@ namespace RageCoop.Client
             }
             catch (Exception ex)
             {
-                GTA.UI.Notification.Show(ex.Message);
+                GTA.UI.Notification.PostTicker(ex.Message, false);
             }
 
             PostMessage(System.Diagnostics.Process.GetCurrentProcess().MainWindowHandle, WM_KEYDOWN, (int)key, 0);

RageCoop.Client/Util/VehicleExtensions.cs

@@ -174,12 +174,12 @@ namespace RageCoop.Client
                     }
                     continue;
                 }
-                else if (door.IsBroken)
+                /*else if (door.IsBroken) // causes break/repair loop in some situations
                 {
                     // The vehicle can only fix a door if the vehicle was completely fixed
                     veh.Repair();
                     return;
-                }
+                }*/
                 if ((model.OpenedDoors & (byte)(1 << i)) != 0)
                 {
                     if ((!door.IsOpen) && (!door.IsBroken))
@@ -196,10 +196,10 @@ namespace RageCoop.Client
                 {
                     veh.Windows[(VehicleWindowIndex)i].Smash();
                 }
-                else if (!veh.Windows[(VehicleWindowIndex)i].IsIntact)
+                /*else if (!veh.Windows[(VehicleWindowIndex)i].IsIntact) // causes smash/repair loop in some situations
                 {
                     veh.Windows[(VehicleWindowIndex)i].Repair();
-                }
+                }*/
             }
 
             foreach (VehicleWheel wheel in veh.Wheels)

RageCoop.Client/WorldThread.cs

@@ -120,7 +120,7 @@ namespace RageCoop.Client
                     if ((c == null) || (c.IsLocal && (ped.Handle != Game.Player.Character.Handle) && ped.PopulationType != EntityPopulationType.Mission))
                     {
 
-                        Main.Logger.Trace($"Removing ped {ped.Handle}. Reason:RemoveTraffic");
+                        // Main.Logger.Trace($"Removing ped {ped.Handle}. Reason:RemoveTraffic");
                         ped.CurrentVehicle?.Delete();
                         ped.Kill();
                         ped.Delete();