fix: Avoid PVS-Studio false positive warning

kbinani · May 8, 2024 · 40041b5 · 40041b5
1 parent 68ae0d6
commit 40041b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/bedrock-block-entity-before-components-introduced.hpp b/src/bedrock-block-entity-before-components-introduced.hpp
@@ -50,8 +50,7 @@ class BedrockBlockEntityBeforeComponentsIntroduced {
       te->set(u8"CustomName", u8R"({"color":"gold","translate":"block.minecraft.ominous_banner"})");
       te->set(u8"Patterns", Banner::OminousBannerPatterns(dataVersion));
     } else {
-      auto patternsB = tag.listTag(u8"Patterns");
-      if (patternsB) {
+      if (auto patternsB = tag.listTag(u8"Patterns"); patternsB) {
         auto patternsJ = List<Tag::Type::Compound>();
         for (auto const &pB : *patternsB) {
           CompoundTag const *c = pB->asCompound();

diff --git a/src/bedrock-block-entity.cpp b/src/bedrock-block-entity.cpp
@@ -74,9 +74,8 @@ class BlockEntity::Impl {
       java::AppendComponent(te, u8"item_name", String(u8R"({"color":"gold","translate":"block.minecraft.ominous_banner"})"));
       patternsJ = Banner::OminousBannerPatterns(dataVersion);
     } else {
-      auto patternsB = tag.listTag(u8"Patterns");
       patternsJ = List<Tag::Type::Compound>();
-      if (patternsB) {
+      if (auto patternsB = tag.listTag(u8"Patterns"); patternsB) {
         for (auto const &pB : *patternsB) {
           CompoundTag const *c = pB->asCompound();
           if (!c) {