From b27cb536a5278313a892e6b3e8a7c86aa66c668e Mon Sep 17 00:00:00 2001 From: iris <60985521+KaiAF@users.noreply.github.com> Date: Sun, 15 Mar 2026 18:13:03 -0500 Subject: Fix game crashing when crafting fireworks (#1230) (#1240) --- Minecraft.World/FireworksRecipe.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Minecraft.World/FireworksRecipe.cpp b/Minecraft.World/FireworksRecipe.cpp index feb1cf57..c4a9ca80 100644 --- a/Minecraft.World/FireworksRecipe.cpp +++ b/Minecraft.World/FireworksRecipe.cpp @@ -37,6 +37,7 @@ void FireworksRecipe::ReleaseThreadStorage() void FireworksRecipe::setResultItem(shared_ptr item) { ThreadStorage *tls = static_cast(TlsGetValue(tlsIdx)); + if (tls == nullptr) tls = tlsDefault; tls->resultItem = item; } @@ -269,6 +270,7 @@ bool FireworksRecipe::matches(shared_ptr craftSlots, Level *l shared_ptr FireworksRecipe::assemble(shared_ptr craftSlots) { ThreadStorage *tls = static_cast(TlsGetValue(tlsIdx)); + if (tls == nullptr) tls = tlsDefault; return tls->resultItem->copy(); //return resultItem->copy(); } @@ -281,6 +283,7 @@ int FireworksRecipe::size() const ItemInstance *FireworksRecipe::getResultItem() { ThreadStorage *tls = static_cast(TlsGetValue(tlsIdx)); + if (tls == nullptr) tls = tlsDefault; return tls->resultItem.get(); //return resultItem.get(); } -- cgit v1.2.3