Fixes & updates (#2208)

- Fixed players becoming invisible after sleeping
- Fixed server hanging when reading corrupted Zlib input
- Updated enchanted golden apple regeneration amplifier to match vanilla
- Bed/anchor explosions can now create fire
- Bamboo from world generator can generate taller
- Conduits now give conduit power effect
- Froglight now rotates correctly when placed
- Using ThreadLocalRandom

Author: PetteriM1

gradle/libs.versions.toml

@@ -18,7 +18,7 @@ leveldbjni = { group = "net.daporkchop", name = "leveldb-mcpe-jni", version = "0
 snappy = { group = "org.xerial.snappy", name = "snappy-java", version = "1.1.10.7" }
 jwt = { group = "com.nimbusds", name = "nimbus-jose-jwt", version = "9.23" }
 jopt-simple = { group = "net.sf.jopt-simple", name = "jopt-simple", version = "5.0.4" }
-blockstateupdater = { group = "org.cloudburstmc", name = "block-state-updater", version = "1.21.30-SNAPSHOT" }
+blockstateupdater = { group = "org.cloudburstmc", name = "block-state-updater", version = "1.21.40-SNAPSHOT" }
 lmbda = { group = "org.lanternpowered", name = "lmbda", version = "2.0.0" }
 noise = { group = "net.daporkchop.lib", name = "noise", version = "0.5.6-SNAPSHOT" }
 lombok = { group = "org.projectlombok", name = "lombok", version = "1.18.36" }

src/main/java/cn/nukkit/Player.java

@@ -94,6 +94,7 @@
 import java.util.*;
 import java.util.Queue;
 import java.util.Map.Entry;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
@@ -1477,7 +1478,7 @@ public void stopSleep() {
             this.server.getPluginManager().callEvent(new PlayerBedLeaveEvent(this, this.level.getBlock(this.sleeping)));
 
             this.sleeping = null;
-            this.setDataProperty(new IntPositionEntityData(DATA_PLAYER_BED_POSITION, 0, 0, 0));
+            this.removeDataProperty(DATA_PLAYER_BED_POSITION);
             this.setDataFlag(DATA_PLAYER_FLAGS, DATA_PLAYER_FLAG_SLEEP, false);
 
             this.level.sleepTicks = 0;
@@ -2085,7 +2086,7 @@ protected void handleMovement(Vector3 newPos) {
                             server.getPluginManager().callEvent(waterFrostEvent);
                             if (!waterFrostEvent.isCancelled()) {
                                 level.setBlockAt((int) block.x, (int) block.y, (int) block.z, Block.ICE_FROSTED, 0);
-                                level.scheduleUpdate(level.getBlock(this.chunk, block.getFloorX(), block.getFloorY(), block.getFloorZ(), true), Utils.random.nextInt(20, 40));
+                                level.scheduleUpdate(level.getBlock(this.chunk, block.getFloorX(), block.getFloorY(), block.getFloorZ(), true), ThreadLocalRandom.current().nextInt(20, 40));
                             }
                         }
                     }
@@ -6938,7 +6939,7 @@ public boolean pickupEntity(Entity entity, boolean near) {
                 }
 
                 if (!itemsWithMending.isEmpty()) {
-                    int itemToRepair = itemsWithMending.getInt(Utils.random.nextInt(itemsWithMending.size()));
+                    int itemToRepair = itemsWithMending.getInt(ThreadLocalRandom.current().nextInt(itemsWithMending.size()));
                     boolean isOffhand = itemToRepair == -1;
 
                     Item repaired = isOffhand ? offhand : this.inventory.getItem(itemToRepair);

src/main/java/cn/nukkit/Server.java

@@ -94,6 +94,7 @@
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
 
@@ -2111,7 +2112,7 @@ public boolean loadLevel(String name) {
      * @return generated
      */
     public boolean generateLevel(String name) {
-        return this.generateLevel(name, Utils.random.nextLong());
+        return this.generateLevel(name, ThreadLocalRandom.current().nextLong());
     }
 
     /**
@@ -2772,6 +2773,9 @@ private static void registerBlockEntities() {
         BlockEntity.registerBlockEntity(BlockEntity.BLAST_FURNACE, BlockEntityBlastFurnace.class);
         BlockEntity.registerBlockEntity(BlockEntity.SMOKER, BlockEntitySmoker.class);
         BlockEntity.registerBlockEntity(BlockEntity.BELL, BlockEntityBell.class);
+        BlockEntity.registerBlockEntity(BlockEntity.CONDUIT, BlockEntityConduit.class);
+
+        // Persistent container, not on vanilla
         BlockEntity.registerBlockEntity(BlockEntity.PERSISTENT_CONTAINER, PersistentDataContainerBlockEntity.class);
     }
 

src/main/java/cn/nukkit/block/BlockBed.java

@@ -75,6 +75,7 @@ public boolean onActivate(Item item, Player player) {
                 }
 
                 Explosion explosion = new Explosion(this.add(0.5, 0, 0.5), 5, this);
+                explosion.setFireSpawnChance(0.3333);
                 explosion.explodeA();
                 explosion.explodeB();
             }

src/main/java/cn/nukkit/block/BlockBeetroot.java

@@ -1,7 +1,8 @@
 package cn.nukkit.block;
 
 import cn.nukkit.item.Item;
-import cn.nukkit.utils.Utils;
+
+import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * Created on 2015/11/22 by xtypr.
@@ -36,7 +37,7 @@ public Item[] getDrops(Item item) {
         if (this.getDamage() >= 0x07) {
             return new Item[]{
                     Item.get(Item.BEETROOT, 0, 1),
-                    Item.get(Item.BEETROOT_SEEDS, 0, Utils.random.nextInt(0, 4))
+                    Item.get(Item.BEETROOT_SEEDS, 0, ThreadLocalRandom.current().nextInt(0, 4))
             };
         } else {
             return new Item[]{

src/main/java/cn/nukkit/block/BlockCauldron.java

@@ -434,7 +434,7 @@ public void clearWithFizz(BlockEntityCauldron cauldron) {
         cauldron.clearCustomColor();
         this.level.setBlock(this, Block.get(CAULDRON_BLOCK), true);
         this.level.addLevelSoundEvent(this, LevelSoundEventPacket.SOUND_FIZZ);
-        this.getLevel().addParticle(new SmokeParticle(add(Math.random(), 1.2, Math.random())), null, 8);
+        this.getLevel().addParticle(new SmokeParticle(add(ThreadLocalRandom.current().nextDouble(), 1.2, ThreadLocalRandom.current().nextDouble())), null, 8);
     }
 
     @Override

src/main/java/cn/nukkit/block/BlockChorusFlower.java

@@ -131,7 +131,8 @@ public int onUpdate(int type) {
                         }
                         // Grow Horizontally
                     } else if (!isFullyAged()) {
-                        for (int i = 0; i < ThreadLocalRandom.current().nextInt(ground ? 5 : 4); i++) {
+                        ThreadLocalRandom random = ThreadLocalRandom.current();
+                        for (int i = 0; i < random.nextInt(ground ? 5 : 4); i++) {
                             BlockFace face = BlockFace.Plane.HORIZONTAL.random();
                             Block check = this.getSide(face);
                             if (check.getId() == AIR && check.down().getId() == AIR && isHorizontalAirExcept(check, face.getOpposite())) {

src/main/java/cn/nukkit/block/BlockCocoa.java

@@ -15,6 +15,8 @@
 import cn.nukkit.utils.Faceable;
 import cn.nukkit.utils.Utils;
 
+import java.util.concurrent.ThreadLocalRandom;
+
 /**
  * Created by CreeperFace on 27. 10. 2016.
  */
@@ -111,7 +113,7 @@ public int onUpdate(int type) {
                 return Level.BLOCK_UPDATE_NORMAL;
             }
         } else if (type == Level.BLOCK_UPDATE_RANDOM) {
-            if (Utils.random.nextInt(2) == 1) {
+            if (ThreadLocalRandom.current().nextInt(2) == 1) {
                 if (this.getDamage() >> 2 < 2) {
                     BlockCocoa block = (BlockCocoa) this.clone();
                     block.setDamage(block.getDamage() + 4);

src/main/java/cn/nukkit/block/BlockComposter.java

@@ -6,9 +6,10 @@
 import cn.nukkit.item.*;
 import cn.nukkit.level.Sound;
 import cn.nukkit.utils.DyeColor;
-import cn.nukkit.utils.Utils;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 
+import java.util.concurrent.ThreadLocalRandom;
+
 public class BlockComposter extends BlockTransparentMeta implements ItemID {
 
     private static final Int2IntOpenHashMap ITEMS = new Int2IntOpenHashMap();
@@ -109,7 +110,7 @@ public boolean onActivate(Item item, Player player) {
             return false;
         }
 
-        boolean success = Utils.random.nextInt(100) < chance;
+        boolean success = ThreadLocalRandom.current().nextInt(100) < chance;
         ComposterFillEvent event = new ComposterFillEvent(this, player, item, chance, success);
         this.level.getServer().getPluginManager().callEvent(event);
 

src/main/java/cn/nukkit/block/BlockConduit.java

@@ -1,8 +1,12 @@
 package cn.nukkit.block;
 
+import cn.nukkit.Player;
+import cn.nukkit.blockentity.BlockEntity;
+import cn.nukkit.item.Item;
 import cn.nukkit.item.ItemTool;
+import cn.nukkit.math.BlockFace;
 
-public class BlockConduit extends BlockSolidMeta {
+public class BlockConduit extends BlockTransparentMeta {
 
     public BlockConduit() {
         this(0);
@@ -56,4 +60,13 @@ public WaterloggingType getWaterloggingType() {
     public boolean alwaysDropsOnExplosion() {
         return true;
     }
+
+    @Override
+    public boolean place(Item item, Block block, Block target, BlockFace face, double fx, double fy, double fz, Player player) {
+        if (this.getLevel().setBlock(this, this, true, true)) {
+            BlockEntity.createBlockEntity(BlockEntity.CONDUIT, this.getChunk(), BlockEntity.getDefaultCompound(this, BlockEntity.CONDUIT));
+            return true;
+        }
+        return false;
+    }
 }