Merge pull request #224 from ethanmoffat/release_bugfixes

Release bugfixes
ethanmoffat · Sep 20, 2022 · 86880ba · 86880ba
2 parents 78f3046 + 4d8e64c
commit 86880ba
Show file tree

Hide file tree

Showing 48 changed files with 587 additions and 245 deletions.
diff --git a/EOLib.Graphics/NativeGraphicsManager.cs b/EOLib.Graphics/NativeGraphicsManager.cs
@@ -1,28 +1,26 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using AutomaticTypeMapper;
+using AutomaticTypeMapper;
 using Microsoft.Xna.Framework.Graphics;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Drawing.Processing;
-using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
+using System;
+using System.Collections.Concurrent;
+using System.IO;
 
 namespace EOLib.Graphics
 {
     [MappedType(BaseType = typeof(INativeGraphicsManager), IsSingleton = true)]
     public sealed class NativeGraphicsManager : INativeGraphicsManager
     {
-        private readonly Dictionary<LibraryGraphicPair, Texture2D> _cache;
-        private readonly object __cachelock__ = new object();
+        private readonly ConcurrentDictionary<LibraryGraphicPair, Texture2D> _cache;
 
         private readonly INativeGraphicsLoader _gfxLoader;
         private readonly IGraphicsDeviceProvider _graphicsDeviceProvider;
 
         public NativeGraphicsManager(INativeGraphicsLoader gfxLoader, IGraphicsDeviceProvider graphicsDeviceProvider)
         {
-            _cache = new Dictionary<LibraryGraphicPair, Texture2D>();
+            _cache = new ConcurrentDictionary<LibraryGraphicPair, Texture2D>();
             _gfxLoader = gfxLoader;
             _graphicsDeviceProvider = graphicsDeviceProvider;
         }
@@ -33,17 +31,16 @@ public Texture2D TextureFromResource(GFXTypes file, int resourceVal, bool transp
 
             var key = new LibraryGraphicPair((int)file, 100 + resourceVal);
 
-            lock (__cachelock__)
+            if (_cache.ContainsKey(key))
             {
-                if (!reloadFromFile && _cache.ContainsKey(key))
+                if (reloadFromFile)
                 {
-                    return _cache[key];
+                    _cache[key]?.Dispose();
+                    _cache.TryRemove(key, out var _);
                 }
-
-                if (_cache.ContainsKey(key) && reloadFromFile)
+                else
                 {
-                    if (_cache[key] != null) _cache[key].Dispose();
-                    _cache.Remove(key);
+                    return _cache[key];
                 }
             }
 
@@ -64,11 +61,7 @@ public Texture2D TextureFromResource(GFXTypes file, int resourceVal, bool transp
                 }
             }
 
-            lock (__cachelock__)
-            {
-                _cache.Add(key, ret);
-            }
-
+            _cache.TryAdd(key, ret);
             return ret;
         }
 
@@ -103,14 +96,9 @@ private static void CrossPlatformMakeTransparent(Image bmp, Color transparentCol
 
         public void Dispose()
         {
-            lock (__cachelock__)
-            {
-                foreach (var text in _cache.Values)
-                {
-                    text.Dispose();
-                }
-                _cache.Clear();
-            }
+            foreach (var text in _cache.Values)
+                text.Dispose();
+            _cache.Clear();
         }
     }
 

diff --git a/EOLib.IO/NumericConstants.cs b/EOLib.IO/NumericConstants.cs
@@ -6,8 +6,8 @@ namespace EOLib.IO
     public static class NumericConstants
     {
         public const int ONE_BYTE_MAX = 253;
-        public const int TWO_BYTE_MAX = 64009;
-        public const int THREE_BYTE_MAX = 16194277;
+        public const int TWO_BYTE_MAX = ONE_BYTE_MAX * ONE_BYTE_MAX;
+        public const int THREE_BYTE_MAX = ONE_BYTE_MAX * ONE_BYTE_MAX * ONE_BYTE_MAX;
 
         public static readonly int[] NUMERIC_MAXIMUM = {ONE_BYTE_MAX, TWO_BYTE_MAX, THREE_BYTE_MAX };
     }

diff --git a/EOLib.IO/Services/DataEncoderService.cs b/EOLib.IO/Services/DataEncoderService.cs
@@ -59,7 +59,7 @@ public List<byte> Deinterleave(IReadOnlyList<byte> data)
 
         public List<byte> FlipMSB(IReadOnlyList<byte> data)
         {
-            return data.Select(x => (byte)(x ^ 0x80u)).ToList();
+            return data.Select(x => (byte)(x == 128 || x == 0 ? x : x ^ 0x80u)).ToList();
         }
 
         public List<byte> SwapMultiples(IReadOnlyList<byte> data, int multi)

diff --git a/EOLib.Test/Net/PacketEncoderServiceTest.cs b/EOLib.Test/Net/PacketEncoderServiceTest.cs
@@ -0,0 +1,45 @@
+using EOLib.Domain.Interact.Quest;
+using EOLib.IO.Services;
+using EOLib.Net;
+using EOLib.Net.PacketProcessing;
+using NUnit.Framework;
+
+namespace EOLib.IO.Test.Services
+{
+    [TestFixture]
+    public class PacketEncoderServiceTest
+    {
+        [Test]
+        public void PacketEncoderService_Encode_127Byte_DoesNotProduceAny0ValueBytes()
+        {
+            var svc = new PacketEncoderService(new NumberEncoderService(), new DataEncoderService());
+
+            var packet = new PacketBuilder(PacketFamily.Quest, PacketAction.Accept)
+                .AddShort(0)
+                .AddShort(0)
+                .AddShort(111)
+                .AddShort(127)
+                .AddChar((byte)DialogReply.Link)
+                .AddChar(1)
+                .Build();
+
+            var encoded = svc.Encode(packet, 5);
+
+            Assert.That(encoded, Has.All.Not.EqualTo(0));
+        }
+
+        [Test]
+        public void PacketEncoderService_Encode_0Byte_DoesNotProduceAny128ValueBytes()
+        {
+            var svc = new PacketEncoderService(new NumberEncoderService(), new DataEncoderService());
+
+            var packet = new PacketBuilder(PacketFamily.Quest, PacketAction.Accept)
+                .AddByte(0)
+                .Build();
+
+            var encoded = svc.Encode(packet, 5);
+
+            Assert.That(encoded, Has.All.Not.EqualTo(128));
+        }
+    }
+}
diff --git a/EOLib/Domain/Account/CreateAccountParameterValidator.cs b/EOLib/Domain/Account/CreateAccountParameterValidator.cs
@@ -6,7 +6,7 @@ namespace EOLib.Domain.Account
     [AutoMappedType]
     public class CreateAccountParameterValidator : ICreateAccountParameterValidator
     {
-        private const string ValidEmailRegex = @"[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+(?:[A-Z]{2}|com|org|net|edu|gov|mil|biz|info|mobi|name|aero|asia|jobs|museum)\b";
+        private const string ValidEmailRegex = @"[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+(?:[a-z]{2}|com|org|net|edu|gov|mil|biz|info|mobi|name|aero|asia|jobs|museum)\b";
 
         public bool AccountNameIsNotLongEnough(string account)
         {
@@ -35,7 +35,7 @@ public bool PasswordIsTooObvious(string password)
 
         public bool EmailIsInvalid(string email)
         {
-            return !System.Text.RegularExpressions.Regex.IsMatch(email, ValidEmailRegex);
+            return !System.Text.RegularExpressions.Regex.IsMatch(email.ToLowerInvariant(), ValidEmailRegex);
         }
     }
 

diff --git a/EOLib/Domain/Character/WalkValidationActions.cs b/EOLib/Domain/Character/WalkValidationActions.cs
@@ -114,7 +114,9 @@ private static bool IsTileSpecWalkable(TileSpec tileSpec)
                 case TileSpec.None:
                     return true;
                 default:
-                    return false;
+                    // These values were tested with the Vanilla 0.28 client
+                    // TileSpec 10, 12, and 31 are walkable while other unknown values are not
+                    return (int)tileSpec == 10 || (int)tileSpec == 12 || (int)tileSpec == 31;
             }
         }
     }

diff --git a/EOLib/Domain/Extensions/CharacterRenderPropertiesExtensions.cs b/EOLib/Domain/Extensions/CharacterRenderPropertiesExtensions.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using EOLib.Domain.Character;
+using EOLib.Domain.Map;
 
 namespace EOLib.Domain.Extensions
 {
@@ -113,5 +114,7 @@ public static CharacterRenderProperties ResetAnimationFrames(this CharacterRende
             props.CurrentAction = props.SitState == SitState.Standing ? CharacterActionState.Standing : CharacterActionState.Sitting;
             return props.ToImmutable();
         }
+
+        public static MapCoordinate Coordinates(this CharacterRenderProperties rp) => new MapCoordinate(rp.MapX, rp.MapY);
     }
 }
diff --git a/EOLib/Domain/Map/CurrentMapStateRepository.cs b/EOLib/Domain/Map/CurrentMapStateRepository.cs
@@ -1,5 +1,6 @@
 using AutomaticTypeMapper;
 using Optional;
+using System;
 using System.Collections.Generic;
 
 namespace EOLib.Domain.Map
@@ -30,6 +31,8 @@ public interface ICurrentMapStateRepository
 
         Option<short> MapWarpID { get; set; }
 
+        Option<DateTime> MapWarpTime { get; set; }
+
         HashSet<short> UnknownPlayerIDs { get; set; }
 
         HashSet<byte> UnknownNPCIndexes { get; set; }
@@ -61,6 +64,8 @@ public interface ICurrentMapStateProvider
 
         Option<short> MapWarpID { get; }
 
+        Option<DateTime> MapWarpTime { get; }
+
         HashSet<short> UnknownPlayerIDs { get; }
 
         HashSet<byte> UnknownNPCIndexes { get; }
@@ -93,6 +98,8 @@ public class CurrentMapStateRepository : ICurrentMapStateRepository, ICurrentMap
 
         public Option<short> MapWarpID { get; set; }
 
+        public Option<DateTime> MapWarpTime { get; set; }
+
         public HashSet<short> UnknownPlayerIDs { get; set; }
 
         public HashSet<byte> UnknownNPCIndexes { get; set; }

diff --git a/EOLib/Domain/Map/MapActions.cs b/EOLib/Domain/Map/MapActions.cs
@@ -51,6 +51,9 @@ public ItemPickupResult PickUpItem(MapItem item)
 
         public void OpenDoor(Warp warp)
         {
+            if (_currentMapStateRepository.PendingDoors.Contains(warp))
+                return;
+
             var packet = new PacketBuilder(PacketFamily.Door, PacketAction.Open)
                 .AddChar((byte)warp.X)
                 .AddChar((byte)warp.Y)

diff --git a/EOLib/Domain/Notifiers/IUserInterfaceNotifier.cs b/EOLib/Domain/Notifiers/IUserInterfaceNotifier.cs
@@ -1,16 +1,21 @@
 using AutomaticTypeMapper;
+using EOLib.Net;
 using System.Collections.Generic;
 
 namespace EOLib.Domain.Notifiers
 {
     public interface IUserInterfaceNotifier
     {
+        void NotifyPacketDialog(PacketFamily packetFamily);
+
         void NotifyMessageDialog(string title, IReadOnlyList<string> messages);
     }
 
     [AutoMappedType]
     public class NoOpUserInterfaceNotifier : IUserInterfaceNotifier
     {
+        public void NotifyPacketDialog(PacketFamily packetFamily) { }
+
         public void NotifyMessageDialog(string title, IReadOnlyList<string> messages) { }
     }
 }
diff --git a/EOLib/PacketHandlers/Chest/ChestOpenHandler.cs b/EOLib/PacketHandlers/Chest/ChestOpenHandler.cs
@@ -1,26 +1,30 @@
 using AutomaticTypeMapper;
-using EOLib.Domain.Character;
 using EOLib.Domain.Login;
 using EOLib.Domain.Map;
+using EOLib.Domain.Notifiers;
 using EOLib.Net;
 using EOLib.Net.Handlers;
+using System.Collections.Generic;
 
 namespace EOLib.PacketHandlers.Chest
 {
     [AutoMappedType]
     public class ChestOpenHandler : InGameOnlyPacketHandler
     {
         private readonly IChestDataRepository _chestDataRepository;
+        private readonly IEnumerable<IUserInterfaceNotifier> _userInterfaceNotifiers;
 
         public override PacketFamily Family => PacketFamily.Chest;
 
         public override PacketAction Action => PacketAction.Open;
 
         public ChestOpenHandler(IPlayerInfoProvider playerInfoProvider,
-                                IChestDataRepository chestDataRepository)
+                                IChestDataRepository chestDataRepository,
+                                IEnumerable<IUserInterfaceNotifier> userInterfaceNotifiers)
             : base(playerInfoProvider)
         {
             _chestDataRepository = chestDataRepository;
+            _userInterfaceNotifiers = userInterfaceNotifiers;
         }
 
         public override bool HandlePacket(IPacket packet)
@@ -35,6 +39,9 @@ public override bool HandlePacket(IPacket packet)
             while (packet.ReadPosition < packet.Length)
                 _chestDataRepository.Items.Add(new ChestItem(packet.ReadShort(), packet.ReadThree(), i++));
 
+            foreach (var notifier in _userInterfaceNotifiers)
+                notifier.NotifyPacketDialog(Family);
+
             return true;
         }
     }

diff --git a/EOLib/PacketHandlers/EndPlayerWarpHandler.cs b/EOLib/PacketHandlers/EndPlayerWarpHandler.cs
@@ -10,6 +10,8 @@
 using EOLib.Net;
 using EOLib.Net.Handlers;
 using EOLib.Net.Translators;
+using Optional;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -52,6 +54,8 @@ public override bool HandlePacket(IPacket packet)
 
             var warpAgreePacketData = _warpAgreePacketTranslator.TranslatePacket(packet);
 
+            _currentMapStateRepository.CurrentMapID = warpAgreePacketData.MapID;
+
             var updatedMainCharacter = warpAgreePacketData.Characters.Single(MainCharacterIDMatches);
 
             //character.renderproperties.isdead is set True by the attack handler
@@ -66,7 +70,6 @@ public override bool HandlePacket(IPacket packet)
 
             var differentMapID = _currentMapStateRepository.CurrentMapID != warpAgreePacketData.MapID;
 
-            _currentMapStateRepository.CurrentMapID = warpAgreePacketData.MapID;
             _currentMapStateRepository.Characters = warpAgreePacketData.Characters.ToDictionary(k => k.ID, v => v);
             _currentMapStateRepository.NPCs = new HashSet<NPC>(warpAgreePacketData.NPCs);
             _currentMapStateRepository.MapItems = new HashSet<MapItem>(warpAgreePacketData.Items);
@@ -80,6 +83,7 @@ public override bool HandlePacket(IPacket packet)
                                           warpAnimation: warpAgreePacketData.WarpAnimation);
 
             _currentMapStateRepository.MapWarpState = WarpState.None;
+            _currentMapStateRepository.MapWarpTime = Option.Some(DateTime.Now);
 
             return true;
         }

diff --git a/EOLib/PacketHandlers/Locker/LockerOpenHandler.cs b/EOLib/PacketHandlers/Locker/LockerOpenHandler.cs
@@ -2,8 +2,10 @@
 using EOLib.Domain.Character;
 using EOLib.Domain.Login;
 using EOLib.Domain.Map;
+using EOLib.Domain.Notifiers;
 using EOLib.Net;
 using EOLib.Net.Handlers;
+using System.Collections.Generic;
 
 namespace EOLib.PacketHandlers.Locker
 {
@@ -14,16 +16,19 @@ namespace EOLib.PacketHandlers.Locker
     public class LockerOpenHandler : InGameOnlyPacketHandler
     {
         private readonly ILockerDataRepository _lockerDataRepository;
+        private readonly IEnumerable<IUserInterfaceNotifier> _userInterfaceNotifiers;
 
         public override PacketFamily Family => PacketFamily.Locker;
 
         public override PacketAction Action => PacketAction.Open;
 
         public LockerOpenHandler(IPlayerInfoProvider playerInfoProvider,
-                                 ILockerDataRepository lockerDataRepository)
+                                 ILockerDataRepository lockerDataRepository,
+                                 IEnumerable<IUserInterfaceNotifier> userInterfaceNotifiers)
             : base(playerInfoProvider)
         {
             _lockerDataRepository = lockerDataRepository;
+            _userInterfaceNotifiers = userInterfaceNotifiers;
         }
 
         public override bool HandlePacket(IPacket packet)
@@ -37,6 +42,9 @@ public override bool HandlePacket(IPacket packet)
             while (packet.ReadPosition < packet.Length)
                 _lockerDataRepository.Items.Add(new InventoryItem(packet.ReadShort(), packet.ReadThree()));
 
+            foreach (var notifier in _userInterfaceNotifiers)
+                notifier.NotifyPacketDialog(Family);
+
             return true;
         }
     }