Merge pull request #2700 from BentoBoxWorld/develop

Release 3.6.0

Author: tastybento

pom.xml

@@ -63,7 +63,7 @@
         <spigot.version>1.21.6-R0.1-SNAPSHOT</spigot.version>
         <!-- Might differ from the last Spigot release for short periods 
             of time -->
-        <paper.version>1.21.6-R0.1-SNAPSHOT</paper.version>
+        <paper.version>1.21.7-R0.1-SNAPSHOT</paper.version>
         <bstats.version>3.0.0</bstats.version>
         <vault.version>1.7.1</vault.version>
         <placeholderapi.version>2.10.9</placeholderapi.version>
@@ -74,7 +74,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>3.5.0</build.version>
+        <build.version>3.6.0</build.version>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <server.jars>${project.basedir}/lib</server.jars>

src/main/java/world/bentobox/bentobox/managers/IslandsManager.java

@@ -1079,7 +1079,10 @@ private CompletableFuture<Boolean> homeTeleportAsync(@NonNull World world, @NonN
                 // Try to fix this teleport location and teleport the player if possible
                 new SafeSpotTeleport.Builder(plugin).entity(player).island(island).homeName(name)
                         .thenRun(() -> teleported(world, user, name, newIsland, island))
-                        .ifFail(() -> goingHome.remove(user.getUniqueId())).buildFuture().thenAccept(result::complete);
+                        .ifFail(() -> {
+                            plugin.logError(user.getName() + " could not be teleported to home because a safe spot could not be found on island " + island.getCenter());
+                            goingHome.remove(user.getUniqueId());
+                            }).buildFuture().thenAccept(result::complete);
                 return;
             }
             Util.teleportAsync(Objects.requireNonNull(player), home).thenAccept(b -> {

src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/PasteHandlerImpl.java

@@ -0,0 +1,74 @@
+package world.bentobox.bentobox.nms.v1_21_7_R0_1_SNAPSHOT;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.craftbukkit.v1_21_R5.CraftWorld;
+import org.bukkit.craftbukkit.v1_21_R5.block.data.CraftBlockData;
+
+import net.minecraft.core.BlockPosition;
+import net.minecraft.world.level.block.state.IBlockData;
+import net.minecraft.world.level.chunk.Chunk;
+import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock;
+import world.bentobox.bentobox.database.objects.Island;
+import world.bentobox.bentobox.nms.PasteHandler;
+import world.bentobox.bentobox.util.DefaultPasteUtil;
+import world.bentobox.bentobox.util.Util;
+
+public class PasteHandlerImpl implements PasteHandler {
+
+    protected static final IBlockData AIR = ((CraftBlockData) AIR_BLOCKDATA).getState();
+
+    /**
+     * Set the block to the location
+     *
+     * @param island   - island
+     * @param location - location
+     * @param bpBlock  - blueprint block
+     */
+    @Override
+    public CompletableFuture<Void> setBlock(Island island, Location location, BlueprintBlock bpBlock) {
+        return Util.getChunkAtAsync(location).thenRun(() -> {
+            Block block = setBlock(location, DefaultPasteUtil.createBlockData(bpBlock));
+            DefaultPasteUtil.setBlockState(island, block, bpBlock);
+            // Set biome
+            if (bpBlock.getBiome() != null) {
+                block.setBiome(bpBlock.getBiome());
+            }
+        });
+    }
+
+    @Override
+    public Block setBlock(Location location, BlockData bd) {
+        Block block = location.getBlock();
+        // Set the block data - default is AIR
+        CraftBlockData craft = (CraftBlockData) bd;
+        net.minecraft.world.level.World nmsWorld = ((CraftWorld) location.getWorld()).getHandle();
+        Chunk nmsChunk = nmsWorld.d(location.getBlockX() >> 4, location.getBlockZ() >> 4);
+        BlockPosition bp = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ());
+        // Setting the block to air before setting to another state prevents some console errors
+        // If the block is a naturally generated tile entity that needs filling, e.g., a chest, then this kind of pasting can cause console errors due to race condition
+        // so the try's are there to try and catch the errors.
+        try {
+            nmsChunk.a(bp, AIR, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+            // Ignore
+        }
+        try {
+            nmsChunk.a(bp, craft.getState(), 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+            // Ignore
+        }
+        try {
+            block.setBlockData(bd, false);
+        } catch (Exception e) {
+            e.printStackTrace();
+            // Ignore
+        }
+        return block;
+    }
+}

src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/WorldRegeneratorImpl.java

@@ -0,0 +1,26 @@
+package world.bentobox.bentobox.nms.v1_21_7_R0_1_SNAPSHOT;
+
+import org.bukkit.block.data.BlockData;
+import org.bukkit.craftbukkit.v1_21_R5.CraftWorld;
+import org.bukkit.craftbukkit.v1_21_R5.block.data.CraftBlockData;
+
+import net.minecraft.core.BlockPosition;
+import net.minecraft.world.level.World;
+import net.minecraft.world.level.chunk.Chunk;
+import world.bentobox.bentobox.nms.CopyWorldRegenerator;
+
+public class WorldRegeneratorImpl extends CopyWorldRegenerator {
+
+    @Override
+    public void setBlockInNativeChunk(org.bukkit.Chunk chunk, int x, int y, int z, BlockData blockData,
+            boolean applyPhysics) {
+        CraftBlockData craft = (CraftBlockData) blockData;
+        World nmsWorld = ((CraftWorld) chunk.getWorld()).getHandle();
+        Chunk nmsChunk = nmsWorld.d(chunk.getX(), chunk.getZ());
+        BlockPosition bp = new BlockPosition((chunk.getX() << 4) + x, y, (chunk.getZ() << 4) + z);
+        // Setting the block to air before setting to another state prevents some console errors
+        nmsChunk.a(bp, PasteHandlerImpl.AIR, applyPhysics ? 1 : 0);
+        nmsChunk.a(bp, craft.getState(), applyPhysics ? 1 : 0);
+    }
+
+}

src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java

@@ -272,7 +272,11 @@ public enum ServerVersion {
         /**
          * @since 3.5.0
          */
-        V1_21_6(Compatibility.COMPATIBLE),;
+        V1_21_6(Compatibility.COMPATIBLE),
+        /**
+         * @since 3.6.0
+         */
+        V1_21_7(Compatibility.COMPATIBLE),;
 
         private final Compatibility compatibility;