Merge pull request #6211 from Xaver-DaRed/craft-container-clean

[Synth] Clean craft container after synth finishes
LandSandBoat · Sep 3, 2024 · 38e60f3 · 38e60f3
2 parents 8e17a5d + dcd61b0
commit 38e60f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/map/packet_system.cpp b/src/map/packet_system.cpp
@@ -6807,7 +6807,7 @@ void SmallPacket0x0EA(map_session_data_t* const PSession, CCharEntity* const PCh
     TracyZoneScoped;
 
     // Prevent sitting while crafting.
-    if (PChar->CraftContainer->getItemsCount() > 0 && PChar->animation == ANIMATION_SYNTH)
+    if (PChar->animation == ANIMATION_SYNTH || (PChar->CraftContainer && PChar->CraftContainer->getItemsCount() > 0))
     {
         return;
     }

diff --git a/src/map/utils/synthutils.cpp b/src/map/utils/synthutils.cpp
@@ -1040,6 +1040,7 @@ namespace synthutils
     {
         doSynthResult(PChar);
 
+        PChar->CraftContainer->Clean();
         PChar->animation = ANIMATION_NONE;
         PChar->updatemask |= UPDATE_HP;
         PChar->pushPacket(new CCharUpdatePacket(PChar));