Prevent sitting while otherwise acting. Use map warp backoff when a r…

…efresh packet is received.
ethanmoffat · May 4, 2023 · 0a01c60 · 0a01c60
1 parent 885c425
commit 0a01c60
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/EOLib/PacketHandlers/Refresh/RefreshReplyHandler.cs b/EOLib/PacketHandlers/Refresh/RefreshReplyHandler.cs
@@ -52,19 +52,20 @@ public override bool HandlePacket(IPacket packet)
                 .WithMapY(updatedMainCharacter.RenderProperties.MapY);
 
             var withoutMainCharacter = data.Characters.Where(x => !IDMatches(x));
-            data = data.WithCharacters(withoutMainCharacter.ToList());
 
             _characterRepository.MainCharacter = _characterRepository.MainCharacter
                 .WithRenderProperties(updatedRenderProperties);
 
-            _currentMapStateRepository.Characters = data.Characters.ToDictionary(k => k.ID, v => v);
+            _currentMapStateRepository.Characters = withoutMainCharacter.ToDictionary(k => k.ID, v => v);
             _currentMapStateRepository.NPCs = new HashSet<DomainNPC>(data.NPCs);
             _currentMapStateRepository.MapItems = new HashSet<MapItem>(data.Items);
 
             _currentMapStateRepository.OpenDoors.Clear();
             _currentMapStateRepository.PendingDoors.Clear();
             _currentMapStateRepository.VisibleSpikeTraps.Clear();
 
+            _currentMapStateRepository.MapWarpTime = Optional.Option.Some(System.DateTime.Now.AddMilliseconds(-100));
+
             foreach (var notifier in _mapChangedNotifiers)
                 notifier.NotifyMapChanged(differentMapID: false, warpAnimation: WarpAnimation.None);
 

diff --git a/EndlessClient/Controllers/FunctionKeyController.cs b/EndlessClient/Controllers/FunctionKeyController.cs
@@ -93,6 +93,9 @@ public bool SelectSpell(int index, bool isAlternate)
 
         public bool Sit()
         {
+            if (_characterProvider.MainCharacter.RenderProperties.IsActing(CharacterActionState.Walking, CharacterActionState.Attacking, CharacterActionState.SpellCast))
+                return false;
+
             _characterActions.ToggleSit();
             return true;
         }