update

OEOTYAN · Mar 23, 2023 · 3eb8ebf · 3eb8ebf
1 parent e59c1cd
commit 3eb8ebf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/core/command/allCommand.cpp b/core/command/allCommand.cpp
@@ -108,10 +108,10 @@ namespace worldedit {
                 auto xuid = player->getXuid();
                 auto& playerData = getPlayersData(xuid);
                 if (results["bool"].get<bool>()) {
-                    playerData.updateArg = 3;
+                    playerData.updateArg = 1;
                     output.trSuccess("worldedit.neighberupdate.on");
                 } else {
-                    playerData.updateArg = 2;
+                    playerData.updateArg = 0;
                     output.trSuccess("worldedit.neighberupdate.off");
                 }
             },

diff --git a/core/data/PlayerData.cpp b/core/data/PlayerData.cpp
@@ -119,6 +119,7 @@ namespace worldedit {
         // if (be != nullptr) {
         //     clearBlockEntity(be);
         // }
+        auto& dim = blockSource->getDimension();
         if (updateExArg % 2 == 1) {
             res |= blockSource->setExtraBlock(pos, *BedrockBlocks::mAir, updateArg);
             res |= blockSource->setBlock(pos, *block, updateArg, nullptr, nullptr);
@@ -127,18 +128,19 @@ namespace worldedit {
                     res |= blockSource->setExtraBlock(pos, *exblock, updateArg);
                 }
                 if (res) {
-                    blockSource->getDimension().forEachPlayer([&](Player& player) -> bool {
+                    dim.forEachPlayer([&](Player& player) -> bool {
+                        player.sendUpdateBlockPacket(pos, *block, UpdateBlockFlags::BlockUpdateAll,
+                                                     UpdateBlockLayer::UpdateBlockDefault);
                         player.sendUpdateBlockPacket(pos, *exblock, UpdateBlockFlags::BlockUpdateAll,
                                                      UpdateBlockLayer::UpdateBlockLiquid);
                         return true;
                     });
                 }
             } else {
-                res |= blockSource->setExtraBlock(pos, *StaticVanillaBlocks::mFlowingWater, updateArg);
-                res |= blockSource->setBlock(pos, *block, updateArg, nullptr, nullptr);
+                res |= blockSource->setExtraBlock(pos, *StaticVanillaBlocks::mFlowingWater, updateArg + 2);
+                res |= blockSource->setBlock(pos, *block, updateArg + 2, nullptr, nullptr);
             }
         } else {
-            auto& dim = blockSource->getDimension();
             ChunkBlockPos cpos(pos, dim.getMinHeight());
             SubChunkPos scpos(pos);
             LevelChunk* chunk = blockSource->getChunkAt(pos);

diff --git a/core/data/PlayerData.h b/core/data/PlayerData.h
@@ -12,7 +12,7 @@ namespace worldedit {
        public:
         std::string xuid = "";
         int maxHistoryLength = 20;
-        int updateArg = 2;
+        int updateArg = 0;
         int updateExArg = 1;
 
         BlockPos mainPos;

diff --git a/core/store/BlockListPattern.cpp b/core/store/BlockListPattern.cpp
@@ -288,6 +288,9 @@ namespace worldedit {
                         }
                         i2++;
                     }
+                    for(auto& ssss : tmpSNBTs){
+                        logger().info("{}",ssss);
+                    }
                     rawBlockIter.block = Block::create(CompoundTag::fromSNBT(tmpSNBTs[0]).get());
                     if (tmpSNBTs.size() > 1) {
                         rawBlockIter.exBlock = Block::create(CompoundTag::fromSNBT(tmpSNBTs[1]).get());