53 changed files with 388 additions and 23781 deletions
--- a/Core/Config/ConfigType.cs
+++ b/Core/Config/ConfigType.cs
@ -5,6 +5,5 @@ public enum ConfigType
    Weapon,
    BaseProperty,
    LevelEntity,
-    Blueprint,
-    ItemInfo
+    Blueprint
 }
--- a/Core/Config/ItemInfoConfig.cs
+++ b/Core/Config/ItemInfoConfig.cs
@ -1,38 +0,0 @@
-using Core.Config.Attributes;
-
-namespace Core.Config;
-
-[ConfigCollection("item/iteminfo.json")]
-public class ItemInfoConfig : IConfig
-{
-    public ConfigType Type => ConfigType.ItemInfo;
-    public int Identifier => Id;
-
-    public int Id { get; set; }
-    public int ItemType { get; set; }
-    public string Name { get; set; } = string.Empty;
-    public List<int> ShowTypes { get; set; } = [];
-    public string AttributesDescription { get; set; } = string.Empty;
-    public string BgDescription { get; set; } = string.Empty;
-    public string Mesh { get; set; } = string.Empty;
-    public int QualityId { get; set; }
-    public int MainTypeId { get; set; }
-    public int RedDotDisableRule { get; set; }
-    public int UseCountLimit { get; set; }
-    public int SortIndex { get; set; }
-    public int MaxCapcity { get; set; }
-    public int MaxStackableNum { get; set; }
-    public int UseLevel { get; set; }
-    public int BeginTimeStamp { get; set; }
-    public int DurationStamp { get; set; }
-    public bool ShowUseButton { get; set; }
-    public int ObtainedShow { get; set; }
-    public string ObtainedShowDescription { get; set; } = string.Empty;
-    public int EntityConfig { get; set; }
-    public int NumLimit { get; set; }
-    public bool ShowInBag { get; set; }
-    public bool Destructible { get; set; }
-    public int ItemBuffType { get; set; }
-    public bool SpecialItem { get; set; }
-    public bool UiPlayItem { get; set; }
-}
--- a/Core/Core.csproj
+++ b/Core/Core.csproj
@ -14,7 +14,6 @@

  <ItemGroup>
    <None Remove="data\config\blueprint\blueprintconfig.json" />
-    <None Remove="data\config\item\iteminfo.json" />
    <None Remove="data\config\property\baseproperty.json" />
    <None Remove="data\config\weapon\weaponconf.json" />
  </ItemGroup>
--- a/Core/data/config/item/iteminfo.json
+++ b/Core/data/config/item/iteminfo.json
--- 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,67 +0,0 @@
-using GameServer.Controllers.Attributes;
-using GameServer.Models;
-using GameServer.Models.Chat;
-using GameServer.Network;
-using GameServer.Systems.Entity;
-using Protocol;
-
-namespace GameServer.Controllers.ChatCommands;
-
-[ChatCommandCategory("player")]
-internal class ChatPlayerCommandHandler
-{
-    private readonly ChatRoom _helperRoom;
-    private readonly PlayerSession _session;
-    private readonly CreatureController _creatureController;
-
-    public ChatPlayerCommandHandler(ModelManager modelManager, PlayerSession session, CreatureController creatureController)
-    {
-        _helperRoom = modelManager.Chat.GetChatRoom(1338);
-        _session = session;
-        _creatureController = creatureController;
-    }
-
-    [ChatCommand("getpos")]
-    [ChatCommandDesc("/player getpos - shows current player coordinates")]
-    public void OnPlayerGetPosCommand(string[] _)
-    {
-        PlayerEntity? entity = _creatureController.GetPlayerEntity();
-        if (entity == null) return;
-
-        _helperRoom.AddMessage(1338, 0, $"Your current position: ({entity.Pos.X / 100}, {entity.Pos.Y / 100}, {entity.Pos.Z / 100})");
-    }
-
-    [ChatCommand("teleport")]
-    [ChatCommandDesc("/player teleport [x] [y] [z] - performing fast travel to specified position")]
-    public async Task OnPlayerTeleportCommand(string[] args)
-    {
-        if (args.Length != 3 || !float.TryParse(args[0], out float x)
-            || !float.TryParse(args[1], out float y)
-            || !float.TryParse(args[2], out float z))
-        {
-            _helperRoom.AddMessage(1338, 0, $"Usage: /player teleport [x] [y] [z]");
-            return;
-        }
-
-        PlayerEntity? entity = _creatureController.GetPlayerEntity();
-
-        if (entity != null)
-        {
-            await _session.Push(MessageId.TeleportNotify, new TeleportNotify
-            {
-                PosX = x * 100,
-                PosY = y * 100,
-                PosZ = z * 100,
-                PosA = 0,
-                MapId = 8,
-                Reason = (int)TeleportReason.Gm,
-                TransitionOption = new TransitionOptionPb
-                {
-                    TransitionType = (int)TransitionType.Empty
-                }
-            });
-        }
-
-        _helperRoom.AddMessage(1338, 0, $"Successfully performed fast travel to ({x}, {y}, {z})");
-    }
-}
--- 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;

@ -33,9 +34,9 @@ internal class ChatSpawnCommandHandler
    {
        if (args.Length != 4 ||
            !(int.TryParse(args[0], out int levelEntityId) &&
-            float.TryParse(args[1], out float x) &&
-            float.TryParse(args[2], out float y) &&
-            float.TryParse(args[3], out float z)))
+            int.TryParse(args[1], out int x) &&
+            int.TryParse(args[2], out int y) &&
+            int.TryParse(args[3], out int z)))
        {
            _helperRoom.AddMessage(1338, 0, "Usage: /spawn monster [id] [x] [y] [z]");
            return;
@ -44,13 +45,19 @@ internal class ChatSpawnCommandHandler
        MonsterEntity monster = _entityFactory.CreateMonster(levelEntityId);
        monster.Pos = new()
        {
-            X = x * 100,
-            Y = y * 100,
-            Z = z * 100
+            X = x,
+            Y = y,
+            Z = z
        };

+        _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
@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using System.Linq.Expressions;
 using System.Reflection;
+using System.Security.Cryptography;
 using GameServer.Controllers.Attributes;
 using GameServer.Network;
 using GameServer.Systems.Entity;
@ -32,57 +33,8 @@ internal class CombatManager
        _creatureController = creatureController;
    }

-    [CombatRequest(CombatRequestData.MessageOneofCase.RTimeStopRequest)]
-    public CombatResponseData OnRTimeStopRequest(CombatRequestContext context) => new()
-    {
-        CombatCommon = context.Request.CombatCommon,
-        RTimeStopResponse = new()
-    };
-
-    [CombatRequest(CombatRequestData.MessageOneofCase.ActivateBuffRequest)]
-    public CombatResponseData OnActivateBuffRequest(CombatRequestContext context) => new()
-    {
-        CombatCommon = context.Request.CombatCommon,
-        ActivateBuffResponse = new()
-    };
-
-    [CombatRequest(CombatRequestData.MessageOneofCase.UseSkillRequest)]
-    public CombatResponseData OnUseSkillRequest(CombatRequestContext context) => new()
-    {
-        CombatCommon = context.Request.CombatCommon,
-        UseSkillResponse = new()
-        {
-            SkillSingleId = context.Request.UseSkillRequest.SkillSingleId,
-            UseSkillInfo = context.Request.UseSkillRequest.UseSkillInfo
-        }
-    };
-
-    [CombatRequest(CombatRequestData.MessageOneofCase.ApplyGameplayEffectRequest)]
-    public CombatResponseData OnApplyGameplayEffectRequest(CombatRequestContext context) => new()
-    {
-        CombatCommon = context.Request.CombatCommon,
-        ApplyGameplayEffectResponse = new ApplyGameplayEffectResponse()
-    };
-
-    [CombatRequest(CombatRequestData.MessageOneofCase.RemoveGameplayEffectRequest)]
-    public CombatResponseData OnRemoveGameplayEffectRequest(CombatRequestContext context) => new()
-    {
-        CombatCommon = context.Request.CombatCommon,
-        RemoveGameplayEffectResponse = new RemoveGameplayEffectResponse()
-    };
-
-    [CombatRequest(CombatRequestData.MessageOneofCase.CreateBulletRequest)]
-    public CombatResponseData OnCreateBulletRequest(CombatRequestContext context)
-    {
-        return new CombatResponseData
-        {
-            CombatCommon = context.Request.CombatCommon,
-            CreateBulletResponse = new()
-        };
-    }
-
    [CombatRequest(CombatRequestData.MessageOneofCase.DamageExecuteRequest)]
-    public CombatResponseData OnDamageExecuteRequest(CombatRequestContext context)
+    public async Task<CombatResponseData> OnDamageExecuteRequest(CombatRequestContext context)
    {
        DamageExecuteRequest request = context.Request.DamageExecuteRequest;

@ -105,7 +57,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
@ -235,18 +199,12 @@ internal class CombatManager
        if (entity.ComponentSystem.TryGet(out EntityFsmComponent? fsmComponent))
        {
            DFsm? dfsm = fsmComponent.Fsms.FirstOrDefault(fsm => fsm.FsmId == request.FsmId);
-
-            if (dfsm == null)
+            dfsm ??= new()
            {
-                dfsm = new DFsm
-                {
-                    FsmId = request.FsmId,
-                    Status = 1,
-                    Flag = (int)EFsmStateFlag.Confirmed
-                };
-
-                fsmComponent.Fsms.Add(dfsm);
-            }
+                FsmId = request.FsmId,
+                Status = 1,
+                Flag = (int)EFsmStateFlag.Confirmed
+            };

            dfsm.CurrentState = request.State;
            context.Notifies.Add(new CombatNotifyData
--- a/GameServer/Controllers/CombatMessageController.cs
+++ b/GameServer/Controllers/CombatMessageController.cs
@ -1,44 +1,18 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Controllers.Combat;
-using GameServer.Models;
 using GameServer.Network;
-using GameServer.Systems.Entity;
-using GameServer.Systems.Event;
-using Microsoft.Extensions.Logging;
+using GameServer.Network.Messages;
 using Protocol;

 namespace GameServer.Controllers;
 internal class CombatMessageController : Controller
 {
-    private readonly ILogger _logger;
-
-    public CombatMessageController(PlayerSession session, ILogger<CombatMessageController> logger) : base(session)
+    public CombatMessageController(PlayerSession session) : base(session)
    {
-        _logger = logger;
+        // CombatMessageController.
    }

-    [NetEvent(MessageId.MovePackagePush)]
-    public async Task OnMovePackagePush(MovePackagePush push, EntitySystem entitySystem, EventSystem eventSystem, ModelManager modelManager)
-    {
-        foreach (MovingEntityData movingEntityData in push.MovingEntities)
-        {
-            EntityBase? entity = entitySystem.Get<EntityBase>(movingEntityData.EntityId);
-            if (entity == null)
-            {
-                _logger.LogWarning("OnMovePackagePush: moving entity not found! Id: {entityId}", movingEntityData.EntityId);
-                continue;
-            }
-
-            MoveReplaySample lastMoveReplay = movingEntityData.MoveInfos.Last();
-            entity.Pos.MergeFrom(lastMoveReplay.Location);
-            entity.Rot.MergeFrom(lastMoveReplay.Rotation);
-
-            if (entity.Id == modelManager.Creature.PlayerEntityId)
-                await eventSystem.Emit(GameEventType.PlayerPositionChanged);
-        }
-    }
-
-    [NetEvent(MessageId.CombatSendPackRequest)]
+    [NetEvent(MessageId.CombatSendPackRequest)] // TODO: CombatSendPackRequest is important
    public async Task<RpcResult> OnCombatSendPackRequest(CombatSendPackRequest request, CombatManager combatManager)
    {
        CombatReceivePackNotify combatPackNotify = new();
--- a/GameServer/Controllers/CreatureController.cs
+++ b/GameServer/Controllers/CreatureController.cs
@ -3,39 +3,26 @@ using GameServer.Controllers.Attributes;
 using GameServer.Extensions.Logic;
 using GameServer.Models;
 using GameServer.Network;
-using GameServer.Settings;
+using GameServer.Network.Messages;
 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) : 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 +31,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,29 +80,51 @@ 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();
    }

-    [GameEvent(GameEventType.PlayerPositionChanged)]
-    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)]
    public async Task OnVisionSkillChanged()
    {
@ -152,9 +169,6 @@ internal class CreatureController : Controller
        _modelManager.Creature.PlayerEntityId = newEntity.Id;
        newEntity.IsCurrentRole = true;

-        newEntity.Pos.MergeFrom(prevEntity.Pos);
-        newEntity.Rot.MergeFrom(prevEntity.Rot);
-
        await UpdateAiHate();
    }

@ -228,8 +242,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,28 +249,15 @@ 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);
            entity.WeaponId = _modelManager.Inventory.GetEquippedWeapon(roleId)?.Id ?? 0;

            if (i == 0) _modelManager.Creature.PlayerEntityId = entity.Id;
-
-            if (_gameplayFeatures.UnlimitedEnergy)
-            {
-                EntityAttributeComponent attr = entity.ComponentSystem.Get<EntityAttributeComponent>();
-                attr.SetAttribute(EAttributeType.EnergyMax, 0);
-                attr.SetAttribute(EAttributeType.SpecialEnergy1Max, 0);
-                attr.SetAttribute(EAttributeType.SpecialEnergy2Max, 0);
-                attr.SetAttribute(EAttributeType.SpecialEnergy3Max, 0);
-                attr.SetAttribute(EAttributeType.SpecialEnergy4Max, 0);
-            }
-
-            playerEntities[i] = entity;
        }
-
-        _entitySystem.Add(playerEntities);
    }

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

-            EntityConcomitantsComponent concomitants = entity.ComponentSystem.Create<EntityConcomitantsComponent>();
+            EntityConcomitantsComponent concomitants = entity.ComponentSystem.Get<EntityConcomitantsComponent>();
            concomitants.CustomEntityIds.Clear();
-            concomitants.VisionEntityId = concomitant.Id;
            concomitants.CustomEntityIds.Add(concomitant.Id);

            EntitySummonerComponent summoner = concomitant.ComponentSystem.Create<EntitySummonerComponent>();
@ -283,51 +282,24 @@ internal class CreatureController : Controller
            summoner.SummonConfigId = summonConfigId;
            summoner.SummonType = ESummonType.ConcomitantCustom;
            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;

@ -16,10 +17,7 @@ internal class InventoryController : Controller
    }

    [NetEvent(MessageId.NormalItemRequest)]
-    public RpcResult OnNormalItemRequest(ModelManager modelManager) => Response(MessageId.NormalItemResponse, new NormalItemResponse
-    {
-        NormalItemList = { modelManager.Inventory.ItemList }
-    });
+    public RpcResult OnNormalItemRequest() => Response(MessageId.NormalItemResponse, new NormalItemResponse());

    [NetEvent(MessageId.WeaponItemRequest)]
    public RpcResult OnWeaponItemRequest(ModelManager modelManager) => Response(MessageId.WeaponItemResponse, new WeaponItemResponse
@ -37,7 +35,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 +57,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()
@ -100,17 +125,12 @@ internal class InventoryController : Controller
        });
    }

-    [GameEvent(GameEventType.DebugUnlockAllItems)]
+    [GameEvent(GameEventType.DebugUnlockAllWeapons)]
    public void DebugUnlockAllWeapons(ConfigManager configManager, ModelManager modelManager)
    {
        foreach (WeaponConfig weaponConf in configManager.Enumerate<WeaponConfig>())
        {
            modelManager.Inventory.AddNewWeapon(weaponConf.ItemId);
        }
-
-        foreach (ItemInfoConfig itemInfo in configManager.Enumerate<ItemInfoConfig>())
-        {
-            modelManager.Inventory.AddItem(itemInfo.Id, itemInfo.MaxStackableNum);
-        }
    }
 }
--- a/GameServer/Controllers/LoginController.cs
+++ b/GameServer/Controllers/LoginController.cs
@ -18,7 +18,7 @@ internal class LoginController : Controller

        // Debug
        await eventSystem.Emit(GameEventType.DebugUnlockAllRoles);
-        await eventSystem.Emit(GameEventType.DebugUnlockAllItems);
+        await eventSystem.Emit(GameEventType.DebugUnlockAllWeapons);

        return Response(MessageId.LoginResponse, new LoginResponse
        {
--- 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/PlayerInfoController.cs
+++ b/GameServer/Controllers/PlayerInfoController.cs
@ -1,6 +1,7 @@
 using GameServer.Controllers.Attributes;
 using GameServer.Models;
 using GameServer.Network;
+using GameServer.Network.Messages;
 using GameServer.Systems.Event;
 using Protocol;

@ -21,8 +22,34 @@ internal class PlayerInfoController : Controller
        {
            RandomSeed = 1337,
            Id = player.Id,
-            Birthday = player.BirthDay,
-            Attributes = { player.Attributes },
+            Birthday = 0,
+            Attributes =
+            {
+                new PlayerAttr
+                {
+                    Key = (int)PlayerAttrKey.Name,
+                    ValueType = (int)PlayerAttrType.String,
+                    StringValue = player.Name
+                },
+                new PlayerAttr
+                {
+                    Key = (int)PlayerAttrKey.Level,
+                    ValueType = (int)PlayerAttrType.Int32,
+                    Int32Value = 10
+                },
+                new PlayerAttr
+                {
+                    Key = (int)PlayerAttrKey.HeadPhoto,
+                    ValueType = (int)PlayerAttrType.Int32,
+                    Int32Value = 1402
+                },
+                new PlayerAttr
+                {
+                    Key = (int)PlayerAttrKey.Sex,
+                    ValueType = (int)PlayerAttrType.Int32,
+                    Int32Value = 1
+                }
+            },
            RoleShowList =
            {
                new RoleShowEntry
@ -45,47 +72,6 @@ internal class PlayerInfoController : Controller
        await Session.Push(MessageId.BasicInfoNotify, basicInfo);
    }

-    [NetEvent(MessageId.ChangeHeadPhotoRequest)]
-    public RpcResult OnChangeHeadPhotoRequest(ChangeHeadPhotoRequest request, ModelManager modelManager)
-    {
-        modelManager.Player.SetAttribute(PlayerAttrKey.HeadPhoto, request.HeadPhotoId);
-
-        return Response(MessageId.ChangeHeadPhotoResponse, new ChangeHeadPhotoResponse
-        {
-            HeadPhotoId = request.HeadPhotoId
-        });
-    }
-
-    [NetEvent(MessageId.BirthdayInitRequest)]
-    public RpcResult OnBirthdayInitRequest(BirthdayInitRequest request, ModelManager modelManager)
-    {
-        modelManager.Player.BirthDay = request.Birthday;
-
-        return Response(MessageId.BirthdayInitResponse, new BirthdayInitResponse());
-    }
-
-    [NetEvent(MessageId.ModifySignatureRequest)]
-    public RpcResult OnModifySignatureRequest(ModifySignatureRequest request, ModelManager modelManager)
-    {
-        modelManager.Player.SetAttribute(PlayerAttrKey.Sign, request.Signature);
-
-        return Response(MessageId.ModifySignatureResponse, new ModifySignatureResponse
-        {
-            Signature = request.Signature
-        });
-    }
-
-    [NetEvent(MessageId.ModifyNameRequest)]
-    public RpcResult OnModifyNameRequest(ModifyNameRequest request, ModelManager modelManager)
-    {
-        modelManager.Player.SetAttribute(PlayerAttrKey.Name, request.Name);
-
-        return Response(MessageId.ModifyNameResponse, new ModifyNameResponse
-        {
-            Name = request.Name
-        });
-    }
-
    [NetEvent(MessageId.PlayerBasicInfoGetRequest)]
    public RpcResult OnPlayerBasicInfoGetRequest()
    {
--- 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)!);
@ -67,36 +54,6 @@ internal class RoleController : Controller
    [NetEvent(MessageId.RoleFavorListRequest)]
    public RpcResult OnRoleFavorListRequest() => Response(MessageId.RoleFavorListResponse, new RoleFavorListResponse());

-    [NetEvent(MessageId.ResonantChainUnlockRequest)]
-    public RpcResult OnResonantChainUnlockRequest(ResonantChainUnlockRequest request, ModelManager modelManager, ConfigManager configManager)
-    {
-        roleInfo? role = modelManager.Roles.Roles.Find(r => r.RoleId == request.RoleId)!;
-    
-        if (role != null)
-        {
-            RoleInfoConfig roleConfig = configManager.GetConfig<RoleInfoConfig>(request.RoleId)!;
-    
-            int resonantChainGroupId = roleConfig.ResonantChainGroupId;
-    
-            // Todo: add buff by _resonantChainGroupId
-    
-            int curr = role.ResonantChainGroupIndex;
-            int next = Math.Min(curr + 1, 6);
-            role.ResonantChainGroupIndex = next;
-    
-            return Response(MessageId.ResonantChainUnlockResponse, new ResonantChainUnlockResponse
-            {
-                RoleId = request.RoleId,
-                ResonantChainGroupIndex = next
-            });
-        }
-    
-        return Response(MessageId.ResonantChainUnlockResponse, new ResonantChainUnlockResponse
-        {
-            ErrCode = (int)ErrorCode.ErrRoleResonNotActive
-        });
-    }
-
    private static List<ArrayIntInt> CreateBasePropList(BasePropertyConfig? config)
    {
        List<ArrayIntInt> baseProp = [];
--- 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/FormationModel.cs
+++ b/GameServer/Models/FormationModel.cs
@ -10,7 +10,7 @@ internal class FormationModel

    public void Set(int[] roleIds)
    {
-        for (int i = 0; i < roleIds.Length; i++)
+        for (int i = 0; i < RoleIds.Length; i++)
        {
            RoleIds[i] = roleIds[i];
        }
--- a/GameServer/Models/InventoryModel.cs
+++ b/GameServer/Models/InventoryModel.cs
@ -1,42 +1,21 @@
-using Protocol;
+using Core.Config;
+using Protocol;

 namespace GameServer.Models;
 internal class InventoryModel
 {
    private int _itemIncrId;

-    public List<NormalItem> ItemList { get; } = [];
    public List<WeaponItem> WeaponList { get; } = [];

-    public WeaponItem? GetEquippedWeapon(int roleId) => WeaponList.SingleOrDefault(weapon => weapon.RoleId == roleId);
-
-    public WeaponItem? GetWeaponById(int incrId) => WeaponList.SingleOrDefault(weapon => weapon.IncrId == incrId);
-
-    public int GetItemCount(int itemId) => ItemList.SingleOrDefault(item => item.Id == itemId)?.Count ?? 0;
-
-    public bool TryUseItem(int itemId, int amount)
+    public WeaponItem? GetEquippedWeapon(int roleId)
    {
-        int currentAmount = GetItemCount(itemId);
-        if (amount > currentAmount) return false;
-
-        AddItem(itemId, -amount);
-        return true;
+        return WeaponList.SingleOrDefault(weapon => weapon.RoleId == roleId);
    }

-    public void AddItem(int itemId, int amount)
+    public WeaponItem? GetWeaponById(int incrId)
    {
-        NormalItem? item = ItemList.SingleOrDefault(item => item.Id == itemId);
-        if (item != null)
-        {
-            item.Count += amount;
-            return;
-        }
-
-        ItemList.Add(new NormalItem
-        {
-            Id = itemId,
-            Count = amount
-        });
+        return WeaponList.SingleOrDefault(weapon => weapon.IncrId == incrId);
    }

    public WeaponItem AddNewWeapon(int weaponId)
--- a/GameServer/Models/PlayerModel.cs
+++ b/GameServer/Models/PlayerModel.cs
@ -1,103 +1,29 @@
-using GameServer.Settings;
-using Protocol;
+using Protocol;
+using GameServer.Settings;

 namespace GameServer.Models;
 internal class PlayerModel
 {
-    private const int MaxPlayerLevel = 80;
-
-    public List<PlayerAttr> Attributes { get; } = [];
-
    public int Id { get; private set; }
-    public int BirthDay { get; set; }
+    public string Name { get; private set; }
    public int[] Characters { get; private set; }
    public Vector Position { get; private set; }

-    public string Name => GetStringAttribute(PlayerAttrKey.Name);
-
    public PlayerModel()
    {
+        Name = string.Empty;
        Characters = [];
        Position = new Vector();
    }

-    public void SetAttribute(PlayerAttrKey key, int value)
-    {
-        SetAttribute(key, PlayerAttrType.Int32, value, null);
-    }
-
-    public void SetAttribute(PlayerAttrKey key, string value)
-    {
-        SetAttribute(key, PlayerAttrType.String, 0, value);
-    }
-
-    public int GetIntAttribute(PlayerAttrKey key)
-    {
-        return GetAttributeOfType(key, PlayerAttrType.Int32)?.Int32Value ?? 0;
-    }
-
-    public string GetStringAttribute(PlayerAttrKey key)
-    {
-        return GetAttributeOfType(key, PlayerAttrType.String)?.StringValue ?? string.Empty;
-    }
-
-    private void SetAttribute(PlayerAttrKey key, PlayerAttrType type, int intValue, string? stringValue)
-    {
-        PlayerAttr? attr = GetAttributeOfType(key, type);
-        if (attr == null)
-        {
-            attr = new PlayerAttr
-            {
-                Key = (int)key,
-                ValueType = (int)type,
-            };
-
-            Attributes.Add(attr);
-        }
-
-        switch (type)
-        {
-            case PlayerAttrType.Int32:
-                attr.Int32Value = intValue; break;
-            case PlayerAttrType.String:
-                attr.StringValue = stringValue; break;
-        }
-    }
-
-    private PlayerAttr? GetAttributeOfType(PlayerAttrKey key, PlayerAttrType type)
-    {
-        PlayerAttr? attr = Attributes.SingleOrDefault(attr => attr.Key == (int)key);
-        if (attr != null)
-        {
-            if (attr.ValueType != (int)type)
-                throw new ArgumentException($"PlayerAttr type mismatch! Key: {key}, type: {(PlayerAttrType)attr.ValueType}, argument type: {type}");
-        }
-
-        return attr;
-    }
-
-    public void LevelUp()
-    {
-        int level = GetIntAttribute(PlayerAttrKey.Level);
-
-        if (level == MaxPlayerLevel) return;
-        SetAttribute(PlayerAttrKey.Level, level + 1);
-    }
-
    public static PlayerModel CreateDefaultPlayer(PlayerStartingValues startingValues)
    {
-        PlayerModel playerModel = new()
+        return new PlayerModel
        {
            Id = 1337,
+            Name = startingValues.Name,
            Characters = startingValues.Characters,
            Position = startingValues.Position.Clone()
        };
-
-        playerModel.SetAttribute(PlayerAttrKey.Name, startingValues.Name);
-        playerModel.SetAttribute(PlayerAttrKey.Level, startingValues.PlayerLevel);
-        playerModel.SetAttribute(PlayerAttrKey.HeadPhoto, startingValues.HeadPhoto);
-        playerModel.SetAttribute(PlayerAttrKey.HeadFrame, startingValues.HeadFrame);
-
-        return playerModel;
    }
 }
--- 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
@ -21,4 +22,149 @@ internal class RoleModel
    {
        return Roles.SingleOrDefault(role => role.RoleId == roleId);
    }
+
+    private static List<ArrayIntInt> CreateBasePropList(BasePropertyConfig? config)
+    {
+        List<ArrayIntInt> baseProp = [];
+        if (config == null) return baseProp;
+
+        baseProp.Add(new() { Key = (int)EAttributeType.Lv, Value = config.Lv });
+        baseProp.Add(new() { Key = (int)EAttributeType.LifeMax, Value = config.LifeMax });
+        baseProp.Add(new() { Key = (int)EAttributeType.Life, Value = config.Life });
+        baseProp.Add(new() { Key = (int)EAttributeType.Sheild, Value = config.Sheild });
+        baseProp.Add(new() { Key = (int)EAttributeType.SheildDamageChange, Value = config.SheildDamageChange });
+        baseProp.Add(new() { Key = (int)EAttributeType.SheildDamageReduce, Value = config.SheildDamageReduce });
+        baseProp.Add(new() { Key = (int)EAttributeType.Atk, Value = config.Atk });
+        baseProp.Add(new() { Key = (int)EAttributeType.Crit, Value = config.Crit });
+        baseProp.Add(new() { Key = (int)EAttributeType.CritDamage, Value = config.CritDamage });
+        baseProp.Add(new() { Key = (int)EAttributeType.Def, Value = config.Def });
+        baseProp.Add(new() { Key = (int)EAttributeType.EnergyEfficiency, Value = config.EnergyEfficiency });
+        baseProp.Add(new() { Key = (int)EAttributeType.CdReduse, Value = config.CdReduse });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionEfficiency, Value = config.ReactionEfficiency });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageChangeNormalSkill, Value = config.DamageChangeNormalSkill });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageChange, Value = config.DamageChange });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageReduce, Value = config.DamageReduce });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageChangeAuto, Value = config.DamageChangeAuto });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageChangeCast, Value = config.DamageChangeCast });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageChangeUltra, Value = config.DamageChangeUltra });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageChangeQte, Value = config.DamageChangeQte });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageChangePhys, Value = config.DamageChangePhys });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageChangeElement1, Value = config.DamageChangeElement1 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageChangeElement2, Value = config.DamageChangeElement2 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageChangeElement3, Value = config.DamageChangeElement3 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageChangeElement4, Value = config.DamageChangeElement4 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageChangeElement5, Value = config.DamageChangeElement5 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageChangeElement6, Value = config.DamageChangeElement6 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageResistancePhys, Value = config.DamageResistancePhys });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageResistanceElement1, Value = config.DamageResistanceElement1 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageResistanceElement2, Value = config.DamageResistanceElement2 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageResistanceElement3, Value = config.DamageResistanceElement3 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageResistanceElement4, Value = config.DamageResistanceElement4 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageResistanceElement5, Value = config.DamageResistanceElement5 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageResistanceElement6, Value = config.DamageResistanceElement6 });
+        baseProp.Add(new() { Key = (int)EAttributeType.HealChange, Value = config.HealChange });
+        baseProp.Add(new() { Key = (int)EAttributeType.HealedChange, Value = config.HealedChange });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageReducePhys, Value = config.DamageReducePhys });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageReduceElement1, Value = config.DamageReduceElement1 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageReduceElement2, Value = config.DamageReduceElement2 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageReduceElement3, Value = config.DamageReduceElement3 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageReduceElement4, Value = config.DamageReduceElement4 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageReduceElement5, Value = config.DamageReduceElement5 });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageReduceElement6, Value = config.DamageReduceElement6 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionChange1, Value = config.ReactionChange1 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionChange2, Value = config.ReactionChange2 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionChange3, Value = config.ReactionChange3 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionChange4, Value = config.ReactionChange4 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionChange5, Value = config.ReactionChange5 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionChange6, Value = config.ReactionChange6 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionChange7, Value = config.ReactionChange7 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionChange8, Value = config.ReactionChange8 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionChange9, Value = config.ReactionChange9 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionChange10, Value = config.ReactionChange10 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionChange11, Value = config.ReactionChange11 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionChange12, Value = config.ReactionChange12 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionChange13, Value = config.ReactionChange13 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionChange14, Value = config.ReactionChange14 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ReactionChange15, Value = config.ReactionChange15 });
+        baseProp.Add(new() { Key = (int)EAttributeType.EnergyMax, Value = config.EnergyMax });
+        baseProp.Add(new() { Key = (int)EAttributeType.Energy, Value = config.Energy });
+        baseProp.Add(new() { Key = (int)EAttributeType.SpecialEnergy1Max, Value = config.SpecialEnergy1Max });
+        baseProp.Add(new() { Key = (int)EAttributeType.SpecialEnergy1, Value = config.SpecialEnergy1 });
+        baseProp.Add(new() { Key = (int)EAttributeType.SpecialEnergy2Max, Value = config.SpecialEnergy2Max });
+        baseProp.Add(new() { Key = (int)EAttributeType.SpecialEnergy2, Value = config.SpecialEnergy2 });
+        baseProp.Add(new() { Key = (int)EAttributeType.SpecialEnergy3Max, Value = config.SpecialEnergy3Max });
+        baseProp.Add(new() { Key = (int)EAttributeType.SpecialEnergy3, Value = config.SpecialEnergy3 });
+        baseProp.Add(new() { Key = (int)EAttributeType.SpecialEnergy4Max, Value = config.SpecialEnergy4Max });
+        baseProp.Add(new() { Key = (int)EAttributeType.SpecialEnergy4, Value = config.SpecialEnergy4 });
+        baseProp.Add(new() { Key = (int)EAttributeType.StrengthMax, Value = config.StrengthMax });
+        baseProp.Add(new() { Key = (int)EAttributeType.Strength, Value = config.Strength });
+        baseProp.Add(new() { Key = (int)EAttributeType.StrengthRecover, Value = config.StrengthRecover });
+        baseProp.Add(new() { Key = (int)EAttributeType.StrengthPunishTime, Value = config.StrengthPunishTime });
+        baseProp.Add(new() { Key = (int)EAttributeType.StrengthRun, Value = config.StrengthRun });
+        baseProp.Add(new() { Key = (int)EAttributeType.StrengthSwim, Value = config.StrengthSwim });
+        baseProp.Add(new() { Key = (int)EAttributeType.StrengthFastSwim, Value = config.StrengthFastSwim });
+        baseProp.Add(new() { Key = (int)EAttributeType.StrengthClimb, Value = config.StrengthClimb });
+        baseProp.Add(new() { Key = (int)EAttributeType.StrengthFastClimb, Value = config.StrengthFastClimb });
+        baseProp.Add(new() { Key = (int)EAttributeType.HardnessMax, Value = config.HardnessMax });
+        baseProp.Add(new() { Key = (int)EAttributeType.Hardness, Value = config.Hardness });
+        baseProp.Add(new() { Key = (int)EAttributeType.HardnessRecover, Value = config.HardnessRecover });
+        baseProp.Add(new() { Key = (int)EAttributeType.HardnessPunishTime, Value = config.HardnessPunishTime });
+        baseProp.Add(new() { Key = (int)EAttributeType.HardnessChange, Value = config.HardnessChange });
+        baseProp.Add(new() { Key = (int)EAttributeType.HardnessReduce, Value = config.HardnessReduce });
+        baseProp.Add(new() { Key = (int)EAttributeType.RageMax, Value = config.RageMax });
+        baseProp.Add(new() { Key = (int)EAttributeType.Rage, Value = config.Rage });
+        baseProp.Add(new() { Key = (int)EAttributeType.RageRecover, Value = config.RageRecover });
+        baseProp.Add(new() { Key = (int)EAttributeType.RagePunishTime, Value = config.RagePunishTime });
+        baseProp.Add(new() { Key = (int)EAttributeType.RageChange, Value = config.RageChange });
+        baseProp.Add(new() { Key = (int)EAttributeType.RageReduce, Value = config.RageReduce });
+        baseProp.Add(new() { Key = (int)EAttributeType.ToughMax, Value = config.ToughMax });
+        baseProp.Add(new() { Key = (int)EAttributeType.Tough, Value = config.Tough });
+        baseProp.Add(new() { Key = (int)EAttributeType.ToughRecover, Value = config.ToughRecover });
+        baseProp.Add(new() { Key = (int)EAttributeType.ToughChange, Value = config.ToughChange });
+        baseProp.Add(new() { Key = (int)EAttributeType.ToughReduce, Value = config.ToughReduce });
+        baseProp.Add(new() { Key = (int)EAttributeType.ToughRecoverDelayTime, Value = config.ToughRecoverDelayTime });
+        baseProp.Add(new() { Key = (int)EAttributeType.ElementPower1, Value = config.ElementPower1 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ElementPower2, Value = config.ElementPower2 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ElementPower3, Value = config.ElementPower3 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ElementPower4, Value = config.ElementPower4 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ElementPower5, Value = config.ElementPower5 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ElementPower6, Value = config.ElementPower6 });
+        baseProp.Add(new() { Key = (int)EAttributeType.SpecialDamageChange, Value = config.SpecialDamageChange });
+        baseProp.Add(new() { Key = (int)EAttributeType.StrengthFastClimbCost, Value = config.StrengthFastClimbCost });
+        baseProp.Add(new() { Key = (int)EAttributeType.ElementPropertyType, Value = config.ElementPropertyType });
+        baseProp.Add(new() { Key = (int)EAttributeType.WeakTime, Value = config.WeakTime });
+        baseProp.Add(new() { Key = (int)EAttributeType.IgnoreDefRate, Value = config.IgnoreDefRate });
+        baseProp.Add(new() { Key = (int)EAttributeType.IgnoreDamageResistancePhys, Value = config.IgnoreDamageResistancePhys });
+        baseProp.Add(new() { Key = (int)EAttributeType.IgnoreDamageResistanceElement1, Value = config.IgnoreDamageResistanceElement1 });
+        baseProp.Add(new() { Key = (int)EAttributeType.IgnoreDamageResistanceElement2, Value = config.IgnoreDamageResistanceElement2 });
+        baseProp.Add(new() { Key = (int)EAttributeType.IgnoreDamageResistanceElement3, Value = config.IgnoreDamageResistanceElement3 });
+        baseProp.Add(new() { Key = (int)EAttributeType.IgnoreDamageResistanceElement4, Value = config.IgnoreDamageResistanceElement4 });
+        baseProp.Add(new() { Key = (int)EAttributeType.IgnoreDamageResistanceElement5, Value = config.IgnoreDamageResistanceElement5 });
+        baseProp.Add(new() { Key = (int)EAttributeType.IgnoreDamageResistanceElement6, Value = config.IgnoreDamageResistanceElement6 });
+        baseProp.Add(new() { Key = (int)EAttributeType.SkillToughRatio, Value = config.SkillToughRatio });
+        baseProp.Add(new() { Key = (int)EAttributeType.StrengthClimbJump, Value = config.StrengthClimbJump });
+        baseProp.Add(new() { Key = (int)EAttributeType.StrengthGliding, Value = config.StrengthGliding });
+        baseProp.Add(new() { Key = (int)EAttributeType.Mass, Value = config.Mass });
+        baseProp.Add(new() { Key = (int)EAttributeType.BrakingFrictionFactor, Value = config.BrakingFrictionFactor });
+        baseProp.Add(new() { Key = (int)EAttributeType.GravityScale, Value = config.GravityScale });
+        baseProp.Add(new() { Key = (int)EAttributeType.SpeedRatio, Value = config.SpeedRatio });
+        baseProp.Add(new() { Key = (int)EAttributeType.DamageChangePhantom, Value = config.DamageChangePhantom });
+        baseProp.Add(new() { Key = (int)EAttributeType.AutoAttackSpeed, Value = config.AutoAttackSpeed });
+        baseProp.Add(new() { Key = (int)EAttributeType.CastAttackSpeed, Value = config.CastAttackSpeed });
+        baseProp.Add(new() { Key = (int)EAttributeType.StatusBuildUp1Max, Value = config.StatusBuildUp1Max });
+        baseProp.Add(new() { Key = (int)EAttributeType.StatusBuildUp1, Value = config.StatusBuildUp1 });
+        baseProp.Add(new() { Key = (int)EAttributeType.StatusBuildUp2Max, Value = config.StatusBuildUp2Max });
+        baseProp.Add(new() { Key = (int)EAttributeType.StatusBuildUp2, Value = config.StatusBuildUp2 });
+        baseProp.Add(new() { Key = (int)EAttributeType.StatusBuildUp3Max, Value = config.StatusBuildUp3Max });
+        baseProp.Add(new() { Key = (int)EAttributeType.StatusBuildUp3, Value = config.StatusBuildUp3 });
+        baseProp.Add(new() { Key = (int)EAttributeType.StatusBuildUp4Max, Value = config.StatusBuildUp4Max });
+        baseProp.Add(new() { Key = (int)EAttributeType.StatusBuildUp4, Value = config.StatusBuildUp4 });
+        baseProp.Add(new() { Key = (int)EAttributeType.StatusBuildUp5Max, Value = config.StatusBuildUp5Max });
+        baseProp.Add(new() { Key = (int)EAttributeType.StatusBuildUp5, Value = config.StatusBuildUp5 });
+        baseProp.Add(new() { Key = (int)EAttributeType.ParalysisTimeMax, Value = config.ParalysisTimeMax });
+        baseProp.Add(new() { Key = (int)EAttributeType.ParalysisTime, Value = config.ParalysisTime });
+        baseProp.Add(new() { Key = (int)EAttributeType.ParalysisTimeRecover, Value = config.ParalysisTimeRecover });
+
+        return baseProp;
+    }
 }
--- 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/Settings/GameplayFeatureSettings.cs
+++ b/GameServer/Settings/GameplayFeatureSettings.cs
@ -2,5 +2,4 @@
 internal class GameplayFeatureSettings
 {
    public bool TeleportByMapMark { get; set; }
-    public bool UnlimitedEnergy { get; set; }
 }
--- a/GameServer/Settings/PlayerStartingValues.cs
+++ b/GameServer/Settings/PlayerStartingValues.cs
@ -4,9 +4,6 @@ namespace GameServer.Settings;
 internal class PlayerStartingValues
 {
    public required string Name { get; set; }
-    public required int PlayerLevel { get; set; }
-    public required int HeadPhoto { get; set; }
-    public required int HeadFrame { get; set; }
    public required int[] Characters { get; set; }
    public required Vector Position { get; set; }
 }
--- a/GameServer/Systems/Entity/Component/EntityConcomitantsComponent.cs
+++ b/GameServer/Systems/Entity/Component/EntityConcomitantsComponent.cs
@ -4,8 +4,6 @@ namespace GameServer.Systems.Entity.Component;
 internal class EntityConcomitantsComponent : EntityComponentBase
 {
    public List<long> CustomEntityIds { get; }
-    public long PhantomRoleEntityId { get; set; }
-    public long VisionEntityId { get; set; }

    public EntityConcomitantsComponent()
    {
@ -21,10 +19,6 @@ internal class EntityConcomitantsComponent : EntityComponentBase
            EntityComponentPb pb = new()
            {
                ConcomitantsComponentPb = new()
-                {
-                    PhantomRoleEid = PhantomRoleEntityId,
-                    VisionEntityId = VisionEntityId
-                }
            };

            pb.ConcomitantsComponentPb.CustomEntityIds.AddRange(CustomEntityIds);
--- a/GameServer/Systems/Entity/Component/EntitySummonerComponent.cs
+++ b/GameServer/Systems/Entity/Component/EntitySummonerComponent.cs
@ -19,7 +19,7 @@ internal class EntitySummonerComponent : EntityComponentBase
            Type = (int)SummonType,
            SummonerId = SummonerId,
            PlayerId = PlayerId,
-            SummonSkillId = SummonSkillId,
+            SummonSkillId = SummonSkillId
        }
    };
 }
--- 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,10 @@ 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 +23,6 @@ internal abstract class EntityBase
        Rot = new Rotator();

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

    public virtual void OnCreate()
@ -45,24 +38,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;
@ -38,6 +37,10 @@ internal class PlayerEntity : EntityBase
    {
        base.OnCreate();

+        // Should be created immediately
+        EntityConcomitantsComponent concomitantsComponent = ComponentSystem.Create<EntityConcomitantsComponent>();
+        concomitantsComponent.CustomEntityIds.Add(Id);
+
        EntityVisionSkillComponent visionSkillComponent = ComponentSystem.Create<EntityVisionSkillComponent>();
        visionSkillComponent.SetExploreTool(1001);

@ -79,7 +82,7 @@ internal class PlayerEntity : EntityBase
    public override EEntityType Type => EEntityType.Player;
    public override EntityConfigType ConfigType => EntityConfigType.Character;

-    public override bool IsVisible => IsCurrentRole || IsConcomitant;
+    public override bool IsVisible => IsCurrentRole;

    public override EntityPb Pb
    {
--- a/GameServer/Systems/Event/GameEventType.cs
+++ b/GameServer/Systems/Event/GameEventType.cs
@ -6,11 +6,10 @@ internal enum GameEventType
    PushDataDone,

    // Actions
-    PlayerPositionChanged,
    FormationUpdated,
    VisionSkillChanged,

    // Debug
    DebugUnlockAllRoles,
-    DebugUnlockAllItems
+    DebugUnlockAllWeapons
 }
--- 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
@ -1,18 +1,14 @@
 {
  "StartingValues": {
    "Name": "ReversedRooms",
-    "PlayerLevel": 8,
-    "HeadPhoto": 1402,
-    "HeadFrame": 80060009,
    "Characters": [ 1402, 1302, 1203 ],
    "Position": {
-      "X": -45000,
-      "Y": 67800,
-      "Z": 2600
+      "X": -35823,
+      "Y": 67132,
+      "Z": 4067
    }
  },
  "Features": {
-    "TeleportByMapMark": true,
-    "UnlimitedEnergy": false
+    "TeleportByMapMark": true
  }
 }