Merge pull request #18 from loentar/fix-party-crash-lp

Fixed client crash when accepting party invitation
JulienGrv · Sep 25, 2017 · d57ea04 · d57ea04
2 parents f3f321c + 39e8252
commit d57ea04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Saga.Map/Packets/0x0D/SMSG_04_PARTYMEMBERINFO.cs b/Saga.Map/Packets/0x0D/SMSG_04_PARTYMEMBERINFO.cs
@@ -94,7 +94,7 @@ public void AddMemberInfo(IEnumerable<Character> chars)
                 Array.Copy(BitConverter.GetBytes(character.HP), 0, this.data, offset + 44, 2);
                 Array.Copy(BitConverter.GetBytes(character.SPMAX), 0, this.data, offset + 46, 2);
                 Array.Copy(BitConverter.GetBytes(character.SP), 0, this.data, offset + 48, 2);
-                this.data[offset + 50] = character._status.CurrentLp;
+                this.data[offset + 50] = Math.Min(character._status.CurrentLp, (byte) 5);
                 this.data[offset + 51] = character._level;
                 this.data[offset + 52] = character.job;
                 this.data[offset + 53] = character.jlvl;
@@ -117,7 +117,7 @@ public void AddCharacterInfo(params Character[] chars)
                 Array.Copy(BitConverter.GetBytes(character.HP), 0, this.data, offset + 44, 2);
                 Array.Copy(BitConverter.GetBytes(character.SPMAX), 0, this.data, offset + 46, 2);
                 Array.Copy(BitConverter.GetBytes(character.SP), 0, this.data, offset + 48, 2);
-                this.data[offset + 50] = character._status.CurrentLp;
+                this.data[offset + 50] = Math.Min(character._status.CurrentLp, (byte) 5);
                 this.data[offset + 51] = character._level;
                 this.data[offset + 52] = character.job;
                 this.data[offset + 53] = character.jlvl;

diff --git a/Saga.Map/Packets/0x0D/SMSG_06_PARTYUNKNOWN.cs b/Saga.Map/Packets/0x0D/SMSG_06_PARTYUNKNOWN.cs
@@ -98,7 +98,7 @@ public byte LP
         {
             set
             {
-                this.data[16] = value;
+                this.data[16] = Math.Min(value, (byte) 5);
             }
         }