38 changed files with 175 additions and 337 deletions
--- a/GameServer/Controllers/AchievementController.cs
+++ b/GameServer/Controllers/AchievementController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
--- a/GameServer/Controllers/ChatCommands/ChatPlayerCommandHandler.cs
+++ b/GameServer/Controllers/ChatCommands/ChatPlayerCommandHandler.cs
@ -1,4 +1,5 @@
-using GameServer.Controllers.Attributes;
+using Core.Config;
+using GameServer.Controllers.Attributes;
 using GameServer.Models;
 using GameServer.Models.Chat;
 using GameServer.Network;
--- a/GameServer/Controllers/ChatCommands/ChatSpawnCommandHandler.cs
+++ b/GameServer/Controllers/ChatCommands/ChatSpawnCommandHandler.cs
@ -4,6 +4,7 @@ using GameServer.Models;
 using GameServer.Models.Chat;
 using GameServer.Network;
 using GameServer.Systems.Entity;
+using Protocol;

 namespace GameServer.Controllers.ChatCommands;

@ -49,8 +50,14 @@ internal class ChatSpawnCommandHandler
            Z = z * 100
        };

+        _entitySystem.Create(monster);
        monster.InitProps(_configManager.GetConfig<BasePropertyConfig>(600000100)!); // TODO: monster property config
-        _entitySystem.Add([monster]);
+
+        await _session.Push(MessageId.EntityAddNotify, new EntityAddNotify
+        {
+            IsAdd = true,
+            EntityPbs = { monster.Pb }
+        });

        await _creatureController.UpdateAiHate();

--- a/GameServer/Controllers/ChatController.cs
+++ b/GameServer/Controllers/ChatController.cs
@ -5,6 +5,7 @@ using GameServer.Controllers.ChatCommands;
 using GameServer.Models;
 using GameServer.Models.Chat;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
--- a/GameServer/Controllers/Combat/CombatManager.cs
+++ b/GameServer/Controllers/Combat/CombatManager.cs
@ -82,7 +82,7 @@ internal class CombatManager
    }

    [CombatRequest(CombatRequestData.MessageOneofCase.DamageExecuteRequest)]
-    public CombatResponseData OnDamageExecuteRequest(CombatRequestContext context)
+    public async Task<CombatResponseData> OnDamageExecuteRequest(CombatRequestContext context)
    {
        DamageExecuteRequest request = context.Request.DamageExecuteRequest;

@ -105,7 +105,19 @@ internal class CombatManager

        if (request.DamageId <= 0 && entity.Type != EEntityType.Player) // Player death not implemented
        {
-            _entitySystem.Destroy([entity]);
+            _entitySystem.Destroy(entity);
+            await _session.Push(MessageId.EntityRemoveNotify, new EntityRemoveNotify
+            {
+                IsRemove = true,
+                RemoveInfos =
+                {
+                    new EntityRemoveInfo
+                    {
+                        EntityId = entity.Id,
+                        Type = (int)ERemoveEntityType.RemoveTypeNormal
+                    }
+                }
+            });
        }

        return new CombatResponseData
--- a/GameServer/Controllers/CreatureController.cs
+++ b/GameServer/Controllers/CreatureController.cs
@ -3,39 +3,31 @@ using GameServer.Controllers.Attributes;
 using GameServer.Extensions.Logic;
 using GameServer.Models;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using GameServer.Settings;
 using GameServer.Systems.Entity;
 using GameServer.Systems.Entity.Component;
 using GameServer.Systems.Event;
-using GameServer.Systems.Notify;
 using Microsoft.Extensions.Options;
 using Protocol;

 namespace GameServer.Controllers;
 internal class CreatureController : Controller
 {
-    private const float DynamicSpawnRadius = 5000;
-    private const float DynamicSpawnPositionDelta = 2500;
-    
    private readonly EntitySystem _entitySystem;
    private readonly EntityFactory _entityFactory;
    private readonly ModelManager _modelManager;
    private readonly ConfigManager _configManager;
-    private readonly IGameActionListener _listener;

    private readonly GameplayFeatureSettings _gameplayFeatures;
-    private readonly Vector _lastDynamicSpawnPos;

-    public CreatureController(PlayerSession session, EntitySystem entitySystem, EntityFactory entityFactory, ModelManager modelManager, ConfigManager configManager, IOptions<GameplayFeatureSettings> gameplayFeatures, IGameActionListener listener) : base(session)
+    public CreatureController(PlayerSession session, EntitySystem entitySystem, EntityFactory entityFactory, ModelManager modelManager, ConfigManager configManager, IOptions<GameplayFeatureSettings> gameplayFeatures) : base(session)
    {
        _entitySystem = entitySystem;
        _entityFactory = entityFactory;
        _modelManager = modelManager;
        _configManager = configManager;
-        _listener = listener;
        _gameplayFeatures = gameplayFeatures.Value;
-
-        _lastDynamicSpawnPos = new();
    }

    public async Task JoinScene(int instanceId)
@ -44,7 +36,15 @@ internal class CreatureController : Controller
        CreateTeamPlayerEntities();
        CreateWorldEntities();

-        await _listener.OnJoinedScene(CreateSceneInfo(), TransitionType.Empty);
+        await Session.Push(MessageId.JoinSceneNotify, new JoinSceneNotify
+        {
+            MaxEntityId = 10000000,
+            TransitionOption = new TransitionOptionPb
+            {
+                TransitionType = (int)TransitionType.Empty
+            },
+            SceneInfo = CreateSceneInfo()
+        });
    }

    [NetEvent(MessageId.EntityActiveRequest)]
@ -85,11 +85,47 @@ internal class CreatureController : Controller
    [GameEvent(GameEventType.FormationUpdated)]
    public async Task OnFormationUpdated()
    {
-        _entitySystem.Destroy(GetPlayerEntities().ToArray());
+        // Remove old entities
+
+        IEnumerable<PlayerEntity> oldEntities = GetPlayerEntities().ToArray();
+        foreach (PlayerEntity oldEntity in oldEntities)
+        {
+            _entitySystem.Destroy(oldEntity);
+        }
+
+        await Session.Push(MessageId.EntityRemoveNotify, new EntityRemoveNotify
+        {
+            IsRemove = true,
+            RemoveInfos =
+            {
+                oldEntities.Select(entity => new EntityRemoveInfo
+                {
+                    EntityId = entity.Id,
+                    Type = (int)entity.Type
+                })
+            }
+        });
+
+        // Spawn new entities
+
        CreateTeamPlayerEntities();

-        _modelManager.Creature.PlayerEntityId = GetPlayerEntities().First().Id;
-        await _listener.OnPlayerFightRoleInfoUpdated(_modelManager.Player.Id, GetFightRoleInfos());
+        IEnumerable<PlayerEntity> newEntities = GetPlayerEntities();
+        await Session.Push(MessageId.EntityAddNotify, new EntityAddNotify
+        {
+            IsAdd = true,
+            EntityPbs =
+            {
+                newEntities.Select(entity => entity.Pb)
+            }
+        });
+
+        _modelManager.Creature.PlayerEntityId = newEntities.First().Id;
+        await Session.Push(MessageId.UpdatePlayerAllFightRoleNotify, new UpdatePlayerAllFightRoleNotify
+        {
+            PlayerId = _modelManager.Player.Id,
+            FightRoleInfos = { GetFightRoleInfos() }
+        });

        await UpdateAiHate();
    }
@ -98,14 +134,6 @@ internal class CreatureController : Controller
    public void OnPlayerPositionChanged()
    {
        _modelManager.Player.Position.MergeFrom(GetPlayerEntity()!.Pos);
-
-        if (_lastDynamicSpawnPos.GetDistance(_modelManager.Player.Position) >= DynamicSpawnPositionDelta)
-        {
-            _lastDynamicSpawnPos.MergeFrom(_modelManager.Player.Position);
-
-            ClearInactiveEntities();
-            SpawnDynamicEntities();
-        }
    }

    [GameEvent(GameEventType.VisionSkillChanged)]
@ -228,8 +256,6 @@ internal class CreatureController : Controller

    private void CreateTeamPlayerEntities()
    {
-        PlayerEntity[] playerEntities = new PlayerEntity[_modelManager.Formation.RoleIds.Length];
-
        for (int i = 0; i < _modelManager.Formation.RoleIds.Length; i++)
        {
            int roleId = _modelManager.Formation.RoleIds[i];
@ -237,7 +263,8 @@ internal class CreatureController : Controller
            PlayerEntity entity = _entityFactory.CreatePlayer(roleId, _modelManager.Player.Id);
            entity.Pos = _modelManager.Player.Position.Clone();
            entity.IsCurrentRole = i == 0;
-            
+
+            _entitySystem.Create(entity);
            entity.ComponentSystem.Get<EntityAttributeComponent>().SetAll(_modelManager.Roles.GetRoleById(roleId)!.GetAttributeList());

            CreateConcomitants(entity);
@ -254,11 +281,7 @@ internal class CreatureController : Controller
                attr.SetAttribute(EAttributeType.SpecialEnergy3Max, 0);
                attr.SetAttribute(EAttributeType.SpecialEnergy4Max, 0);
            }
-
-            playerEntities[i] = entity;
        }
-
-        _entitySystem.Add(playerEntities);
    }

    private void CreateConcomitants(PlayerEntity entity)
@ -272,6 +295,7 @@ internal class CreatureController : Controller
        if (roleId != -1)
        {
            PlayerEntity concomitant = _entityFactory.CreatePlayer(roleId, 0);
+            _entitySystem.Create(concomitant);

            EntityConcomitantsComponent concomitants = entity.ComponentSystem.Create<EntityConcomitantsComponent>();
            concomitants.CustomEntityIds.Clear();
@ -285,49 +309,23 @@ internal class CreatureController : Controller
            summoner.PlayerId = _modelManager.Player.Id;

            concomitant.InitProps(_configManager.GetConfig<BasePropertyConfig>(roleId)!);
-            _entitySystem.Add([concomitant]);
        }
    }

    private void CreateWorldEntities()
-    {
-        _lastDynamicSpawnPos.MergeFrom(_modelManager.Player.Position.Clone());
-        SpawnDynamicEntities();
-    }
-
-    private void ClearInactiveEntities()
-    {
-        _entitySystem.Destroy(_entitySystem.EnumerateEntities()
-            .Where(e => e is MonsterEntity && e.DynamicId != 0 &&
-            e.Pos.GetDistance(_modelManager.Player.Position) > DynamicSpawnRadius).ToArray());
-    }
-
-    private void SpawnDynamicEntities()
    {
        Vector playerPos = _modelManager.Player.Position;

-        // Currently only monsters
-        IEnumerable<LevelEntityConfig> entitiesToSpawn = _configManager.Enumerate<LevelEntityConfig>()
-        .Where(config => config.MapId == 8 && Math.Abs(config.Transform[0].X / 100 - playerPos.X) < DynamicSpawnRadius && Math.Abs(config.Transform[0].Y / 100 - playerPos.Y) < DynamicSpawnRadius &&
-        config.BlueprintType.StartsWith("Monster"));
-
-        List<MonsterEntity> spawnMonsters = [];
-        foreach (LevelEntityConfig levelEntity in entitiesToSpawn)
+        // Test monster
+        MonsterEntity monster = _entityFactory.CreateMonster(106003002); // Turtle.
+        monster.Pos = new()
        {
-            if (_entitySystem.HasDynamicEntity(levelEntity.EntityId)) continue;
+            X = playerPos.X + 250,
+            Y = playerPos.Y + 250,
+            Z = playerPos.Z
+        };

-            MonsterEntity monster = _entityFactory.CreateMonster(levelEntity.EntityId);
-            monster.Pos = new()
-            {
-                X = levelEntity.Transform[0].X / 100,
-                Y = levelEntity.Transform[0].Y / 100,
-                Z = levelEntity.Transform[0].Z / 100
-            };
-
-            monster.InitProps(_configManager.GetConfig<BasePropertyConfig>(600000100)!);
-            spawnMonsters.Add(monster);
-        }
-
-        _entitySystem.Add(spawnMonsters);
+        _entitySystem.Create(monster);
+        monster.InitProps(_configManager.GetConfig<BasePropertyConfig>(600000100)!);
    }
 }
--- a/GameServer/Controllers/DailyActivityController.cs
+++ b/GameServer/Controllers/DailyActivityController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
--- a/GameServer/Controllers/ExchangeRewardController.cs
+++ b/GameServer/Controllers/ExchangeRewardController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
--- a/GameServer/Controllers/ExploreProgressController.cs
+++ b/GameServer/Controllers/ExploreProgressController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
--- a/GameServer/Controllers/FormationAttributeController.cs
+++ b/GameServer/Controllers/FormationAttributeController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
--- a/GameServer/Controllers/FormationController.cs
+++ b/GameServer/Controllers/FormationController.cs
@ -1,6 +1,8 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Models;
 using GameServer.Network;
+using GameServer.Network.Messages;
+using GameServer.Systems.Entity;
 using GameServer.Systems.Event;
 using Protocol;

--- a/GameServer/Controllers/FriendSystemController.cs
+++ b/GameServer/Controllers/FriendSystemController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
--- a/GameServer/Controllers/GachaController.cs
+++ b/GameServer/Controllers/GachaController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
--- a/GameServer/Controllers/InfluenceReputationController.cs
+++ b/GameServer/Controllers/InfluenceReputationController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
--- a/GameServer/Controllers/InventoryController.cs
+++ b/GameServer/Controllers/InventoryController.cs
@ -4,6 +4,7 @@ using GameServer.Extensions.Logic;
 using GameServer.Models;
 using GameServer.Network;
 using GameServer.Systems.Entity;
+using GameServer.Systems.Entity.Component;
 using GameServer.Systems.Event;
 using Protocol;

@ -37,7 +38,7 @@ internal class InventoryController : Controller
    public RpcResult OnItemExchangeInfoRequest() => Response(MessageId.ItemExchangeInfoResponse, new ItemExchangeInfoResponse());

    [NetEvent(MessageId.EquipTakeOnRequest)]
-    public RpcResult OnEquipTakeOnRequest(EquipTakeOnRequest request, ModelManager modelManager, CreatureController creatureController, RoleController roleController, ConfigManager configManager)
+    public async Task<RpcResult> OnEquipTakeOnRequest(EquipTakeOnRequest request, ModelManager modelManager, CreatureController creatureController, ConfigManager configManager)
    {
        WeaponItem? weapon = modelManager.Inventory.GetWeaponById(request.Data.EquipIncId);
        if (weapon == null) return Response(MessageId.EquipTakeOnResponse, new EquipTakeOnResponse
@ -59,12 +60,39 @@ internal class InventoryController : Controller

        // Set new weapon
        weapon.RoleId = role.RoleId;
-        roleController.ApplyWeaponPropertiesToRole(role.RoleId, weaponConf);
+        role.ApplyWeaponProperties(weaponConf);
+
+        // Update role prop data on client
+        await Session.Push(MessageId.PbRolePropsNotify, new PbRolePropsNotify
+        {
+            RoleId = role.RoleId,
+            BaseProp = { role.BaseProp },
+            AddProp = { role.AddProp }
+        });

-        // Update entity (if this role is currently active)
        PlayerEntity? entity = creatureController.GetPlayerEntityByRoleId(request.Data.RoleId);
-        entity?.ChangeEquipment(weapon.Id);
-        entity?.ChangeGameplayAttributes(role.GetAttributeList());
+        if (entity != null)
+        {
+            // Update entity equipment
+            EntityEquipComponent equipComponent = entity.ComponentSystem.Get<EntityEquipComponent>();
+            equipComponent.WeaponId = weapon.Id;
+
+            await Session.Push(MessageId.EntityEquipChangeNotify, new EntityEquipChangeNotify
+            {
+                EntityId = entity.Id,
+                EquipComponent = equipComponent.Pb.EquipComponent
+            });
+
+            // Update entity gameplay attributes
+            EntityAttributeComponent attrComponent = entity.ComponentSystem.Get<EntityAttributeComponent>();
+            attrComponent.SetAll(role.GetAttributeList());
+
+            await Session.Push(MessageId.AttributeChangedNotify, new AttributeChangedNotify
+            {
+                Id = entity.Id,
+                Attributes = { attrComponent.Pb.AttributeComponent.GameAttributes }
+            });
+        }

        // Response
        EquipTakeOnResponse response = new()
--- a/GameServer/Controllers/LordGymController.cs
+++ b/GameServer/Controllers/LordGymController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
--- a/GameServer/Controllers/RoguelikeController.cs
+++ b/GameServer/Controllers/RoguelikeController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
--- a/GameServer/Controllers/RoleController.cs
+++ b/GameServer/Controllers/RoleController.cs
@ -4,38 +4,25 @@ using GameServer.Extensions.Logic;
 using GameServer.Models;
 using GameServer.Network;
 using GameServer.Systems.Event;
-using GameServer.Systems.Notify;
 using Protocol;

 namespace GameServer.Controllers;
 internal class RoleController : Controller
 {
-    private readonly ModelManager _modelManager;
-    private readonly IGameActionListener _listener;
-
-    public RoleController(PlayerSession session, ModelManager modelManager, IGameActionListener listener) : base(session)
+    public RoleController(PlayerSession session) : base(session)
    {
-        _modelManager = modelManager;
-        _listener = listener;
-    }
-
-    public void ApplyWeaponPropertiesToRole(int roleId, WeaponConfig weaponConfiguration)
-    {
-        roleInfo? role = _modelManager.Roles.GetRoleById(roleId) ?? throw new ArgumentException($"Role with id {roleId} doesn't exist");
-
-        role.ApplyWeaponProperties(weaponConfiguration);
-        _ = _listener.OnRolePropertiesUpdated(roleId, role.BaseProp, role.AddProp);
+        // RoleController.
    }

    [GameEvent(GameEventType.DebugUnlockAllRoles)]
-    public void UnlockAllRoles(ConfigManager configManager)
+    public void UnlockAllRoles(ConfigManager configManager, ModelManager modelManager)
    {
        foreach (RoleInfoConfig roleConfig in configManager.Enumerate<RoleInfoConfig>())
        {
-            roleInfo role = _modelManager.Roles.Create(roleConfig.Id);
+            roleInfo role = modelManager.Roles.Create(roleConfig.Id);
            role.BaseProp.AddRange(CreateBasePropList(configManager.GetConfig<BasePropertyConfig>(roleConfig.Id)));

-            WeaponItem weapon = _modelManager.Inventory.AddNewWeapon(roleConfig.InitWeaponItemId);
+            WeaponItem weapon = modelManager.Inventory.AddNewWeapon(roleConfig.InitWeaponItemId);
            weapon.RoleId = role.RoleId;

            role.ApplyWeaponProperties(configManager.GetConfig<WeaponConfig>(weapon.Id)!);
--- a/GameServer/Controllers/RouletteController.cs
+++ b/GameServer/Controllers/RouletteController.cs
@ -1,5 +1,7 @@
 using GameServer.Controllers.Attributes;
+using GameServer.Models;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using GameServer.Systems.Entity;
 using GameServer.Systems.Entity.Component;
 using GameServer.Systems.Event;
--- a/GameServer/Controllers/ShopController.cs
+++ b/GameServer/Controllers/ShopController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
--- a/GameServer/Controllers/TeleportController.cs
+++ b/GameServer/Controllers/TeleportController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
--- a/GameServer/Controllers/TowerController.cs
+++ b/GameServer/Controllers/TowerController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
--- a/GameServer/Controllers/TutorialController.cs
+++ b/GameServer/Controllers/TutorialController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
--- a/GameServer/Controllers/WorldController.cs
+++ b/GameServer/Controllers/WorldController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using GameServer.Systems.Event;
 using Protocol;

--- a/GameServer/Controllers/WorldMapController.cs
+++ b/GameServer/Controllers/WorldMapController.cs
@ -1,5 +1,6 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using GameServer.Settings;
 using GameServer.Systems.Entity;
 using Microsoft.Extensions.Options;
--- a/GameServer/Extensions/Logic/MathExtensions.cs
+++ b/GameServer/Extensions/Logic/MathExtensions.cs
@ -1,13 +0,0 @@
-using Protocol;
-
-namespace GameServer.Extensions.Logic;
-internal static class MathExtensions
-{
-    public static float GetDistance(this Vector self, Vector other)
-    {
-        float x = self.X - other.X;
-        float y = self.Y - other.Y;
-
-        return (float)Math.Sqrt(x * x + y * y);
-    }
-}
--- a/GameServer/Models/Chat/ChatRoom.cs
+++ b/GameServer/Models/Chat/ChatRoom.cs
@ -1,4 +1,5 @@
-using Protocol;
+using Google.Protobuf;
+using Protocol;

 namespace GameServer.Models.Chat;
 internal class ChatRoom
--- a/GameServer/Models/RoleModel.cs
+++ b/GameServer/Models/RoleModel.cs
@ -1,4 +1,5 @@
-using Protocol;
+using Core.Config;
+using Protocol;

 namespace GameServer.Models;
 internal class RoleModel
--- a/GameServer/Network/Kcp/KcpConnection.cs
+++ b/GameServer/Network/Kcp/KcpConnection.cs
@ -8,7 +8,6 @@ internal class KcpConnection : IConnection
 {
    private readonly byte[] _recvBuffer;
    private readonly KcpConversation _conv;
-    private readonly ManualResetEvent _sendEvent;
    private uint _upStreamSeqNo;
    private uint _downStreamSeqNo;

@ -16,7 +15,6 @@ internal class KcpConnection : IConnection
    {
        _conv = conv;
        _recvBuffer = GC.AllocateUninitializedArray<byte>(8192);
-        _sendEvent = new ManualResetEvent(true);
    }

    public bool Active => !_conv.TransportClosed;
@ -53,16 +51,7 @@ internal class KcpConnection : IConnection
        MessageManager.EncodeMessage(memory[BaseMessage.LengthFieldSize..], message);

        if (_conv == null) throw new InvalidOperationException("Trying to send message when conv is null");
-
-        if (!_sendEvent.WaitOne(0))
-        {
-            await Task.Yield();
-            _ = _sendEvent.WaitOne();
-        }
-
-        _sendEvent.Reset();
        await _conv.SendAsync(memoryOwner.Memory[..networkSize]);
-        _sendEvent.Set();
    }

    private uint NextUpStreamSeqNo()
--- a/GameServer/Program.cs
+++ b/GameServer/Program.cs
@ -13,7 +13,6 @@ using GameServer.Network.Rpc;
 using GameServer.Settings;
 using GameServer.Systems.Entity;
 using GameServer.Systems.Event;
-using GameServer.Systems.Notify;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@ -40,8 +39,7 @@ internal static class Program
                        .AddScoped<MessageManager>().AddSingleton<EventHandlerFactory>()
                        .AddScoped<RpcManager>().AddScoped<IRpcEndPoint, RpcSessionEndPoint>()
                        .AddSingleton<SessionManager>()
-                        .AddScoped<EventSystem>().AddScoped<EntitySystem>().AddScoped<IGameActionListener, NotifySystem>()
-                        .AddScoped<EntityFactory>()
+                        .AddScoped<EventSystem>().AddScoped<EntitySystem>().AddScoped<EntityFactory>()
                        .AddScoped<ModelManager>().AddScoped<ControllerManager>()
                        .AddScoped<CombatManager>().AddScoped<ChatCommandManager>()
                        .AddHostedService<WWGameServer>();
--- a/GameServer/Systems/Entity/EntityBase.cs
+++ b/GameServer/Systems/Entity/EntityBase.cs
@ -1,6 +1,5 @@
 using Core.Config;
 using GameServer.Systems.Entity.Component;
-using GameServer.Systems.Notify;
 using Protocol;

 namespace GameServer.Systems.Entity;
@ -13,15 +12,12 @@ internal abstract class EntityBase
    public Rotator Rot { get; set; }

    public bool Active { get; set; }
-    public int DynamicId { get; protected set; }

    public EntityState State { get; protected set; }

    public bool IsConcomitant => ComponentSystem.TryGet<EntitySummonerComponent>(out _);

-    protected IGameActionListener ActionListener { get; }
-
-    public EntityBase(long id, IGameActionListener listener)
+    public EntityBase(long id)
    {
        Id = id;

@ -29,7 +25,6 @@ internal abstract class EntityBase
        Rot = new Rotator();

        ComponentSystem = new EntityComponentSystem();
-        ActionListener = listener;
    }

    public virtual void OnCreate()
@ -45,24 +40,6 @@ internal abstract class EntityBase
        // Activate.
    }

-    public void ChangeEquipment(int weaponId)
-    {
-        if (ComponentSystem.TryGet(out EntityEquipComponent? equipComponent))
-        {
-            equipComponent.WeaponId = weaponId;
-            _ = ActionListener.OnEntityEquipmentChanged(Id, equipComponent.Pb.EquipComponent);
-        }
-    }
-
-    public void ChangeGameplayAttributes(IEnumerable<GameplayAttributeData> attributes)
-    {
-        if (ComponentSystem.TryGet(out EntityAttributeComponent? attrComponent))
-        {
-            attrComponent.SetAll(attributes);
-            _ = ActionListener.OnEntityAttributesChanged(Id, attrComponent.Pb.AttributeComponent.GameAttributes);
-        }
-    }
-
    public virtual LivingStatus LivingStatus => LivingStatus.Alive;
    public virtual bool IsVisible => true;

--- a/GameServer/Systems/Entity/EntityFactory.cs
+++ b/GameServer/Systems/Entity/EntityFactory.cs
@ -1,40 +1,12 @@
-using Microsoft.Extensions.DependencyInjection;
-
-namespace GameServer.Systems.Entity;
+namespace GameServer.Systems.Entity;
 internal class EntityFactory
 {
-    private static readonly ObjectFactory<PlayerEntity> s_createPlayerEntity;
-    private static readonly ObjectFactory<MonsterEntity> s_createMonsterEntity;
-
    private long _entityIdCounter;
-    private readonly IServiceProvider _serviceProvider;
-
-    static EntityFactory()
-    {
-        s_createPlayerEntity = ActivatorUtilities.CreateFactory<PlayerEntity>([typeof(long), typeof(int), typeof(int)]);
-        s_createMonsterEntity = ActivatorUtilities.CreateFactory<MonsterEntity>([typeof(long), typeof(int)]);
-    }
-
-    public EntityFactory(IServiceProvider serviceProvider)
-    {
-        _serviceProvider = serviceProvider;
-    }

    public PlayerEntity CreatePlayer(int characterConfigId, int playerId)
-    {
-        PlayerEntity entity = s_createPlayerEntity(_serviceProvider, [NextId(), characterConfigId, playerId]);
-        entity.OnCreate();
+        => new(NextId(), characterConfigId, playerId);

-        return entity;
-    }
-
-    public MonsterEntity CreateMonster(int levelEntityId)
-    {
-        MonsterEntity monsterEntity = s_createMonsterEntity(_serviceProvider, [NextId(), levelEntityId]);
-        monsterEntity.OnCreate();
-
-        return monsterEntity;
-    }
+    public MonsterEntity CreateMonster(int levelEntityId) => new(NextId(), levelEntityId);

    private long NextId() => Interlocked.Increment(ref _entityIdCounter);
 }
--- a/GameServer/Systems/Entity/EntitySystem.cs
+++ b/GameServer/Systems/Entity/EntitySystem.cs
@ -1,19 +1,13 @@
-using GameServer.Systems.Notify;
-using Protocol;
+using Protocol;

 namespace GameServer.Systems.Entity;
 internal class EntitySystem
 {
    private readonly List<EntityBase> _entities;
-    private readonly List<int> _dynamicEntityIds;

-    private readonly IGameActionListener _listener;
-
-    public EntitySystem(IGameActionListener listener)
+    public EntitySystem()
    {
        _entities = [];
-        _dynamicEntityIds = [];
-        _listener = listener;
    }

    public IEnumerable<EntityBase> EnumerateEntities()
@ -21,36 +15,18 @@ internal class EntitySystem
        return _entities;
    }

-    public void Add(IEnumerable<EntityBase> entities)
+    public void Create(EntityBase entity)
    {
-        foreach (EntityBase entity in entities)
-        {
-            if (_entities.Any(e => e.Id == entity.Id))
-                throw new InvalidOperationException($"EntitySystem::Create - entity with id {entity.Id} already exists");
+        if (_entities.Any(e => e.Id == entity.Id)) 
+            throw new InvalidOperationException($"EntitySystem::Create - entity with id {entity.Id} already exists");

-            _entities.Add(entity);
-
-            if (entity.DynamicId != 0)
-                _dynamicEntityIds.Add(entity.DynamicId);
-        }
-
-        _ = _listener.OnEntitiesAdded(entities);
+        entity.OnCreate();
+        _entities.Add(entity);
    }

-    public bool HasDynamicEntity(int dynamicId)
+    public void Destroy(EntityBase entity)
    {
-        return _dynamicEntityIds.Contains(dynamicId);
-    }
-
-    public void Destroy(IEnumerable<EntityBase> entities)
-    {
-        foreach (EntityBase entity in entities)
-        {
-            _ = _entities.Remove(entity);
-            _ = _dynamicEntityIds.Remove(entity.DynamicId);
-        }
-
-        _ = _listener.OnEntitiesRemoved(entities);
+        _ = _entities.Remove(entity);
    }

    public void Activate(EntityBase entity)
--- a/GameServer/Systems/Entity/MonsterEntity.cs
+++ b/GameServer/Systems/Entity/MonsterEntity.cs
@ -1,14 +1,12 @@
 using GameServer.Systems.Entity.Component;
-using GameServer.Systems.Notify;
 using Protocol;

 namespace GameServer.Systems.Entity;
 internal class MonsterEntity : EntityBase
 {
-    public MonsterEntity(long id, int configId, IGameActionListener listener) : base(id, listener)
+    public MonsterEntity(long id, int configId) : base(id)
    {
        ConfigId = configId;
-        DynamicId = configId;
    }

    public int ConfigId { get; }
@ -34,20 +32,17 @@ internal class MonsterEntity : EntityBase
        fsm.Fsms.Add(new DFsm
        {
            FsmId = 10007, // Main State Machine
-            CurrentState = 10013 // Battle Branching
+            CurrentState = 10013, // Battle Branching
+            Status = 1, // ??
+            Flag = (int)EFsmStateFlag.Confirmed
        });

        fsm.Fsms.Add(new DFsm
        {
            FsmId = 10007, // Main State Machine
-            CurrentState = 10015 // Moving Combat
-        });
-
-        // Some monsters need weapon
-        fsm.Fsms.Add(new DFsm
-        {
-            FsmId = 100,
-            CurrentState = 9 // [9 - Empty hand, 10 - Crowbar, 11 - flamethrower, 12 - chainsaw, 13 - electric blade, 14 - sniper rifle]
+            CurrentState = 10015, // Moving Combat
+            Status = 1, // ??
+            Flag = (int)EFsmStateFlag.Confirmed
        });
    }

--- a/GameServer/Systems/Entity/PlayerEntity.cs
+++ b/GameServer/Systems/Entity/PlayerEntity.cs
@ -1,11 +1,10 @@
 using GameServer.Systems.Entity.Component;
-using GameServer.Systems.Notify;
 using Protocol;

 namespace GameServer.Systems.Entity;
 internal class PlayerEntity : EntityBase
 {
-    public PlayerEntity(long id, int configId, int playerId, IGameActionListener listener) : base(id, listener)
+    public PlayerEntity(long id, int configId, int playerId) : base(id)
    {
        ConfigId = configId;
        PlayerId = playerId;
--- a/GameServer/Systems/Notify/IGameActionListener.cs
+++ b/GameServer/Systems/Notify/IGameActionListener.cs
@ -1,14 +0,0 @@
-using GameServer.Systems.Entity;
-using Protocol;
-
-namespace GameServer.Systems.Notify;
-internal interface IGameActionListener
-{
-    Task OnJoinedScene(SceneInformation sceneInformation, TransitionType transitionType);
-    Task OnEntitiesAdded(IEnumerable<EntityBase> entities);
-    Task OnEntitiesRemoved(IEnumerable<EntityBase> entities);
-    Task OnPlayerFightRoleInfoUpdated(int playerId, IEnumerable<FightRoleInformation> fightRoles);
-    Task OnRolePropertiesUpdated(int roleId, IEnumerable<ArrayIntInt> baseProp, IEnumerable<ArrayIntInt> addProp);
-    Task OnEntityEquipmentChanged(long entityId, EquipComponentPb componentPb);
-    Task OnEntityAttributesChanged(long entityId, IEnumerable<GameplayAttributeData> attributes);
-}
--- a/GameServer/Systems/Notify/NotifySystem.cs
+++ b/GameServer/Systems/Notify/NotifySystem.cs
@ -1,97 +0,0 @@
-using GameServer.Models;
-using GameServer.Network;
-using GameServer.Systems.Entity;
-using Protocol;
-
-namespace GameServer.Systems.Notify;
-internal class NotifySystem : IGameActionListener
-{
-    private readonly PlayerSession _session;
-    private readonly ModelManager _modelManager;
-
-    public NotifySystem(PlayerSession session, ModelManager modelManager)
-    {
-        _session = session;
-        _modelManager = modelManager;
-    }
-
-    public Task OnJoinedScene(SceneInformation sceneInformation, TransitionType transitionType)
-    {
-        return _session.Push(MessageId.JoinSceneNotify, new JoinSceneNotify
-        {
-            SceneInfo = sceneInformation,
-            TransitionOption = new TransitionOptionPb
-            {
-                TransitionType = (int)transitionType
-            }
-        });
-    }
-
-    public Task OnEntitiesAdded(IEnumerable<EntityBase> entities)
-    {
-        if (_modelManager.Creature.LoadingWorld) return Task.CompletedTask;
-
-        return _session.Push(MessageId.EntityAddNotify, new EntityAddNotify
-        {
-            IsAdd = true,
-            EntityPbs = { entities.Select(e => e.Pb) }
-        });
-    }
-
-    public Task OnEntitiesRemoved(IEnumerable<EntityBase> entities)
-    {
-        if (_modelManager.Creature.LoadingWorld) return Task.CompletedTask;
-
-        return _session.Push(MessageId.EntityRemoveNotify, new EntityRemoveNotify
-        {
-            IsRemove = true,
-            RemoveInfos =
-            {
-                entities.Select(e => new EntityRemoveInfo
-                {
-                    EntityId = e.Id,
-                    Type = (int)ERemoveEntityType.RemoveTypeNormal
-                })
-            }
-        });
-    }
-
-    public Task OnPlayerFightRoleInfoUpdated(int playerId, IEnumerable<FightRoleInformation> fightRoles)
-    {
-        return _session.Push(MessageId.UpdatePlayerAllFightRoleNotify, new UpdatePlayerAllFightRoleNotify
-        {
-            PlayerId = playerId,
-            FightRoleInfos = { fightRoles }
-        });
-    }
-
-    public Task OnRolePropertiesUpdated(int roleId, IEnumerable<ArrayIntInt> baseProp, IEnumerable<ArrayIntInt> addProp)
-    {
-        if (_modelManager.Creature.LoadingWorld) return Task.CompletedTask;
-
-        return _session.Push(MessageId.PbRolePropsNotify, new PbRolePropsNotify
-        {
-            RoleId = roleId,
-            BaseProp = { baseProp },
-            AddProp = { addProp }
-        });
-    }
-
-    public Task OnEntityEquipmentChanged(long entityId, EquipComponentPb componentPb)
-    {
-        return _session.Push(MessageId.EntityEquipChangeNotify, new EntityEquipChangeNotify
-        {
-            EntityId = entityId,
-            EquipComponent = componentPb
-        });
-    }
-
-    public Task OnEntityAttributesChanged(long entityId, IEnumerable<GameplayAttributeData> attributes)
-    {
-        return _session.Push(MessageId.AttributeChangedNotify, new AttributeChangedNotify
-        {
-            Id = entityId,
-            Attributes = { attributes }
-        });
-    }
-}
--- a/GameServer/gameplay.json
+++ b/GameServer/gameplay.json
@ -6,13 +6,13 @@
    "HeadFrame": 80060009,
    "Characters": [ 1402, 1302, 1203 ],
    "Position": {
-      "X": -45000,
-      "Y": 67800,
-      "Z": 2600
+      "X": -35823,
+      "Y": 67132,
+      "Z": 4067
    }
  },
  "Features": {
    "TeleportByMapMark": true,
-    "UnlimitedEnergy": false
+    "UnlimitedEnergy": true
  }
 }