Merge pull request #135 from taida957789/master

[MapleLib] Fix nulled LinkValue when path is not endwith ".img"
lastbattle · Sep 19, 2021 · e1e73c5 · e1e73c5
2 parents cd5f8c3 + 4aef568
commit e1e73c5
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/MapleLib/WzLib/WzProperties/WzUOLProperty.cs b/MapleLib/WzLib/WzProperties/WzUOLProperty.cs
@@ -153,15 +153,20 @@ public WzObject LinkValue
 						{
                             if (linkVal is WzImageProperty)
                                 linkVal = ((WzImageProperty)linkVal)[path];
-                            else if (linkVal is WzImage image)
+                            else if (linkVal is WzImage image) 
                                 linkVal = image[path];
-                            else if (linkVal is WzDirectory directory)
-                                linkVal = directory[path];
-                            else
-                            {
-                                MapleLib.Helpers.ErrorLogger.Log(MapleLib.Helpers.ErrorLevel.Critical, "UOL got nexon'd at property: " + this.FullPath);
-                                return null;
-                            }
+							else if (linkVal is WzDirectory directory)
+							{
+								if (path.EndsWith(".img"))
+									linkVal = directory[path];
+								else
+									linkVal = directory[path + ".img"];
+							}
+							else
+							{
+								MapleLib.Helpers.ErrorLogger.Log(MapleLib.Helpers.ErrorLevel.Critical, "UOL got nexon'd at property: " + this.FullPath);
+								return null;
+							}
 						}
 					}
 				}