Netherite items can float in lava (#2150)

CloudburstMC · Oct 24, 2023 · 1ba53ab · 1ba53ab
1 parent 812f77e
commit 1ba53ab
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/cn/nukkit/entity/item/EntityItem.java b/src/main/java/cn/nukkit/entity/item/EntityItem.java
@@ -1,6 +1,7 @@
 package cn.nukkit.entity.item;
 
 import cn.nukkit.Server;
+import cn.nukkit.block.Block;
 import cn.nukkit.block.BlockID;
 import cn.nukkit.entity.Entity;
 import cn.nukkit.event.entity.EntityDamageEvent;
@@ -39,6 +40,7 @@ public int getNetworkId() {
     protected Item item;
 
     protected int pickupDelay;
+    protected boolean floatsInLava;
 
     @Override
     public float getWidth() {
@@ -109,6 +111,7 @@ protected void initEntity() {
         int id = this.item.getId();
         if (id >= Item.NETHERITE_INGOT && id <= Item.NETHERITE_SCRAP) {
             this.fireProof = true; // Netherite items are fireproof
+            this.floatsInLava = true;
         }
 
         this.server.getPluginManager().callEvent(new ItemSpawnEvent(this));
@@ -214,7 +217,8 @@ public boolean onUpdate(int currentTick) {
             }*/
 
             int bid = level.getBlock(this.getFloorX(), NukkitMath.floorDouble(this.y + 0.53), this.getFloorZ(), false).getId();
-            if (bid == BlockID.WATER || bid == BlockID.STILL_WATER) {
+            if (bid == BlockID.WATER || bid == BlockID.STILL_WATER ||
+                    (this.floatsInLava && (bid == Block.LAVA || bid == Block.STILL_LAVA))) {
                 this.motionY = this.getGravity() / 2;
             } else if (!this.isOnGround()) {
                 this.motionY -= this.getGravity();