Merge pull request #70 from EliphasNUIT/master

fixed a bug where dhuum's pre-event would be shorter than expected
baaron4 · Jul 1, 2018 · f8dea1f · f8dea1f
2 parents bc31d42 + 492a513
commit f8dea1f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/LuckParser/Models/ParseModels/Players/Boss.cs b/LuckParser/Models/ParseModels/Players/Boss.cs
@@ -316,7 +316,7 @@ private void setPhases(ParsedLog log)
                     }
                     break;
                 case 0x4BFA:
-                    CombatItem invulDhuum = log.getBoonData().Find(x => x.getSkillID() == 762 && x.isBuffremove() != ParseEnum.BuffRemove.None && x.getSrcInstid() == getInstid());
+                    CombatItem invulDhuum = log.getBoonData().Find(x => x.getSkillID() == 762 && x.isBuffremove() != ParseEnum.BuffRemove.None && x.getSrcInstid() == getInstid() && x.getTime() > 129000 + log.getBossData().getFirstAware());
                     if (invulDhuum != null)
                     {
                         end = invulDhuum.getTime() - log.getBossData().getFirstAware();

diff --git a/LuckParser/Properties/AssemblyInfo.cs b/LuckParser/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.1.0")]
-[assembly: AssemblyFileVersion("1.5.1.0")]
+[assembly: AssemblyVersion("1.5.2.0")]
+[assembly: AssemblyFileVersion("1.5.2.0")]