From 40041b52cac5aec8796cdb0bb0040be88f3428c8 Mon Sep 17 00:00:00 2001
From: kbinani <kbinani.bt@gmail.com>
Date: Wed, 8 May 2024 14:48:06 +0900
Subject: [PATCH] fix: Avoid PVS-Studio false positive warning

---
 src/bedrock-block-entity-before-components-introduced.hpp | 3 +--
 src/bedrock-block-entity.cpp                              | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/bedrock-block-entity-before-components-introduced.hpp b/src/bedrock-block-entity-before-components-introduced.hpp
index 3c92c0793..8b218e712 100644
--- 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
index d10cfbdd5..6b82d9a87 100644
--- 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) {