remove redundant flags and check place result

isBlockPlaceCancelled is covered by UPDATE_SKIP_BLOCK_ENTITY_SIDEEFFECTS and the
the lack of UPDATE_NEIGHBORS / UPDATE_MOVE_BY_PISTON in revertPlace
preventPoiUpdated is not relevant anymore

Author: Lulu13022002

paper-server/patches/sources/net/minecraft/world/item/ItemStack.java.patch

@@ -23,7 +23,7 @@
                  }
              }
          };
-@@ -373,10 +_,171 @@
+@@ -373,10 +_,167 @@
              return InteractionResult.PASS;
          } else {
              Item item = this.getItem();
@@ -104,13 +104,9 @@
 +                    player.containerMenu.sendAllDataToRemote();
 +                    serverLevel.capturedTileEntities.clear(); // Paper - Allow chests to be placed with NBT data; clear out block entities as chests and such will pop loot
 +                    // revert back all captured blocks
-+                    serverLevel.preventPoiUpdated = true; // CraftBukkit - SPIGOT-5710
-+                    serverLevel.isBlockPlaceCancelled = true; // Paper - prevent calling cleanup logic when undoing a block place upon a cancelled BlockPlaceEvent
 +                    for (org.bukkit.block.BlockState blockstate : blocks) {
 +                        ((org.bukkit.craftbukkit.block.CraftBlockState) blockstate).revertPlace();
 +                    }
-+                    serverLevel.isBlockPlaceCancelled = false; // Paper - prevent calling cleanup logic when undoing a block place upon a cancelled BlockPlaceEvent
-+                    serverLevel.preventPoiUpdated = false;
 +
 +                    SignItem.openSign = null; // SPIGOT-6758 - Reset on early return
 +                } else {

paper-server/patches/sources/net/minecraft/world/level/Level.java.patch

@@ -38,7 +38,7 @@
      protected final NeighborUpdater neighborUpdater;
      private final List<TickingBlockEntity> pendingBlockEntityTickers = Lists.newArrayList();
      private boolean tickingBlockEntities;
-@@ -119,6 +_,61 @@
+@@ -119,6 +_,59 @@
      private final DamageSources damageSources;
      private long subTickCount;
 
@@ -47,10 +47,8 @@
 +    public boolean pvpMode;
 +    public org.bukkit.generator.ChunkGenerator generator;
 +
-+    public boolean preventPoiUpdated = false; // CraftBukkit - SPIGOT-5710
 +    public boolean captureBlockStates = false;
 +    public boolean captureTreeGeneration = false;
-+    public boolean isBlockPlaceCancelled = false; // Paper - prevent calling cleanup logic when undoing a block place upon a cancelled BlockPlaceEvent
 +    public Map<BlockPos, org.bukkit.craftbukkit.block.CraftBlockState> capturedBlockStates = new java.util.LinkedHashMap<>(); // Paper
 +    public Map<BlockPos, BlockEntity> capturedTileEntities = new java.util.LinkedHashMap<>(); // Paper - Retain block place order when capturing blockstates
 +    public List<net.minecraft.world.entity.item.ItemEntity> captureDrops;
@@ -393,7 +391,7 @@
                  if (blockState1 == state) {
                      if (blockState != blockState1) {
                          this.setBlocksDirty(pos, blockState, blockState1);
-@@ -251,12 +_,72 @@
+@@ -251,12 +_,68 @@
 
                      this.updatePOIOnBlockStateChange(pos, blockState, blockState1);
                  }
@@ -455,11 +453,7 @@
 +                } // Paper - Fix block place logic
 +            }
 +
-+            // CraftBukkit start - SPIGOT-5710
-+            if (!this.preventPoiUpdated) {
-+                this.updatePOIOnBlockStateChange(pos, blockState, blockState1);
-+            }
-+            // CraftBukkit end
++            this.updatePOIOnBlockStateChange(pos, blockState, blockState1);
 +        }
 +    }
 +    // CraftBukkit end

paper-server/patches/sources/net/minecraft/world/level/block/ChangeOverTimeBlock.java.patch

@@ -5,7 +5,7 @@
          float f = 0.05688889F;
          if (random.nextFloat() < 0.05688889F) {
 -            this.getNextState(state, level, pos, random).ifPresent(blockState -> level.setBlockAndUpdate(pos, blockState));
-+            this.getNextState(state, level, pos, random).ifPresent(blockState -> org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(level, pos, blockState)); // CraftBukkit
++            this.getNextState(state, level, pos, random).ifPresent(blockState -> org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(level, pos, blockState, 3)); // CraftBukkit
          }
      }
 

paper-server/patches/sources/net/minecraft/world/level/block/LiquidBlock.java.patch

@@ -48,7 +48,7 @@
 -                    level.setBlockAndUpdate(pos, block.defaultBlockState());
 -                    this.fizz(level, pos);
 +                    // CraftBukkit start
-+                    if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(level, pos, block.defaultBlockState())) {
++                    if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(level, pos, block.defaultBlockState(), 3)) {
 +                        this.fizz(level, pos);
 +                    }
 +                    // CraftBukkit end
@@ -59,7 +59,7 @@
 -                    level.setBlockAndUpdate(pos, Blocks.BASALT.defaultBlockState());
 -                    this.fizz(level, pos);
 +                    // CraftBukkit start
-+                    if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(level, pos, Blocks.BASALT.defaultBlockState())) {
++                    if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(level, pos, Blocks.BASALT.defaultBlockState(), 3)) {
 +                        this.fizz(level, pos);
 +                    }
 +                    // CraftBukkit end

paper-server/patches/sources/net/minecraft/world/level/block/MultifaceSpreader.java.patch

@@ -5,7 +5,7 @@
                  }
 
 -                return level.setBlock(pos.pos(), stateForPlacement, 2);
-+                return org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(level, pos.source(), pos.pos(), stateForPlacement, 2); // CraftBukkit
++                return org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(level, pos.source(), pos.pos(), stateForPlacement, 2, true); // CraftBukkit
              } else {
                  return false;
              }

paper-server/patches/sources/net/minecraft/world/level/block/PointedDripstoneBlock.java.patch

@@ -26,7 +26,7 @@
                              if (fluidAboveStalactite.get().sourceState.is(Blocks.MUD) && fluid == Fluids.WATER) {
                                  BlockState blockState = Blocks.CLAY.defaultBlockState();
 -                                level.setBlockAndUpdate(fluidAboveStalactite.get().pos, blockState);
-+                                if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(level, fluidAboveStalactite.get().pos, blockState)) { // Paper - Call BlockFormEvent
++                                if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(level, fluidAboveStalactite.get().pos, blockState, 3)) { // Paper - Call BlockFormEvent
                                  Block.pushEntitiesUp(fluidAboveStalactite.get().sourceState, blockState, level, fluidAboveStalactite.get().pos);
                                  level.gameEvent(GameEvent.BLOCK_CHANGE, fluidAboveStalactite.get().pos, GameEvent.Context.of(blockState));
                                  level.levelEvent(1504, blockPos, 0);

paper-server/patches/sources/net/minecraft/world/level/chunk/LevelChunk.java.patch

@@ -128,24 +128,7 @@
      }
 
      @Nullable
-@@ -298,7 +_,7 @@
-                 if (flag && blockState.hasBlockEntity()) {
-                     if (!this.level.isClientSide && flag2) {
-                         BlockEntity blockEntity = this.level.getBlockEntity(pos);
--                        if (blockEntity != null) {
-+                        if (blockEntity != null && !this.level.isBlockPlaceCancelled) { // Paper - prevent calling cleanup logic when undoing a block place upon a cancelled BlockPlaceEvent
-                             blockEntity.preRemoveSideEffects(pos, blockState);
-                         }
-                     }
-@@ -306,14 +_,14 @@
-                     this.removeBlockEntity(pos);
-                 }
- 
--                if ((flag || block instanceof BaseRailBlock) && this.level instanceof ServerLevel serverLevel && ((flags & 1) != 0 || flag1)) {
-+                if ((flag || block instanceof BaseRailBlock) && this.level instanceof ServerLevel serverLevel && ((flags & 1) != 0 || flag1) && !this.level.isBlockPlaceCancelled) { // Paper - prevent calling cleanup logic when undoing a block place upon a cancelled BlockPlaceEvent
-                     blockState.affectNeighborsAfterRemoval(serverLevel, pos, flag1);
-                 }
- 
+@@ -313,7 +_,7 @@
                  if (!section.getBlockState(i, i1, i2).is(block)) {
                      return null;
                  } else {

paper-server/src/main/java/org/bukkit/craftbukkit/block/CapturedBlockState.java

@@ -9,7 +9,6 @@
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.util.CraftLocation;
 
 @Deprecated(forRemoval = true)
 public final class CapturedBlockState extends CraftBlockState {

paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java

@@ -245,8 +245,9 @@ public boolean update(boolean force, boolean applyPhysics) {
     // used when the flags matter for non API usage
     public boolean place(int flags) {
         if (!this.isPlaced()) {
-            return true;
+            return false;
         }
+
         return this.getWorldHandle().setBlock(this.position, this.data, flags);
     }
 

paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java

@@ -949,19 +949,23 @@ public static boolean handleMoistureChangeEvent(Level world, BlockPos pos, net.m
     public static BlockPos sourceBlockOverride = null; // SPIGOT-7068: Add source block override, not the most elegant way but better than passing down a BlockPosition up to five methods deep.
 
     public static boolean handleBlockSpreadEvent(LevelAccessor world, BlockPos source, BlockPos target, net.minecraft.world.level.block.state.BlockState state, int flags) {
+        return handleBlockSpreadEvent(world, source, target, state, flags, false);
+    }
+
+    public static boolean handleBlockSpreadEvent(LevelAccessor world, BlockPos source, BlockPos target, net.minecraft.world.level.block.state.BlockState state, int flags, boolean checkSetResult) {
         // Suppress during worldgen
         if (!(world instanceof Level)) {
-            world.setBlock(target, state, flags);
-            return true;
+            boolean result = world.setBlock(target, state, flags);
+            return !checkSetResult || result;
         }
 
         CraftBlockState snapshot = CraftBlockStates.getBlockState(world, target);
         snapshot.setData(state);
 
         BlockSpreadEvent event = new BlockSpreadEvent(snapshot.getBlock(), CraftBlock.at(world, CraftEventFactory.sourceBlockOverride != null ? CraftEventFactory.sourceBlockOverride : source), snapshot);
         if (event.callEvent()) {
-            snapshot.place(flags);
-            return true;
+            boolean result = snapshot.place(flags);
+            return !checkSetResult || result;
         }
         return false;
     }
@@ -1905,10 +1909,6 @@ public static BlockPhysicsEvent callBlockPhysicsEvent(LevelAccessor world, Block
         return event;
     }
 
-    public static boolean handleBlockFormEvent(Level world, BlockPos pos, net.minecraft.world.level.block.state.BlockState block) {
-        return CraftEventFactory.handleBlockFormEvent(world, pos, block, 3);
-    }
-
     public static EntityPotionEffectEvent callEntityPotionEffectChangeEvent(net.minecraft.world.entity.LivingEntity entity, @Nullable MobEffectInstance oldEffect, @Nullable MobEffectInstance newEffect, EntityPotionEffectEvent.Cause cause) {
         return CraftEventFactory.callEntityPotionEffectChangeEvent(entity, oldEffect, newEffect, cause, true);
     }
@@ -1945,13 +1945,17 @@ public static boolean handleBlockFormEvent(Level world, BlockPos pos, net.minecr
     }
 
     public static boolean handleBlockFormEvent(Level world, BlockPos pos, net.minecraft.world.level.block.state.BlockState state, int flags, @Nullable Entity entity) {
+        return CraftEventFactory.handleBlockFormEvent(world, pos, state, flags, entity, false);
+    }
+
+    public static boolean handleBlockFormEvent(Level world, BlockPos pos, net.minecraft.world.level.block.state.BlockState state, int flags, @Nullable Entity entity, boolean checkSetResult) {
         CraftBlockState snapshot = CraftBlockStates.getBlockState(world, pos);
         snapshot.setData(state);
 
         BlockFormEvent event = (entity == null) ? new BlockFormEvent(snapshot.getBlock(), snapshot) : new EntityBlockFormEvent(entity.getBukkitEntity(), snapshot.getBlock(), snapshot);
         if (event.callEvent()) {
-            snapshot.place(flags);
-            return true;
+            boolean result = snapshot.place(flags);
+            return !checkSetResult || result;
         }
 
         return false;