diff --git a/src/main/java/cn/nukkit/Player.java b/src/main/java/cn/nukkit/Player.java
index e18215e8a53..ca0dad3635a 100644
--- a/src/main/java/cn/nukkit/Player.java
+++ b/src/main/java/cn/nukkit/Player.java
@@ -4488,10 +4488,20 @@ public void kill() {
                 case LAVA:
                     Block block = this.level.getBlock(new Vector3(this.x, this.y - 1, this.z));
                     if (block.getId() == Block.MAGMA) {
-                        message = "death.attack.lava.magma";
-                        break;
+                        message = "death.attack.magma";
+                    } else {
+                        message = "death.attack.lava";
+                    }
+                    if (killer instanceof EntityProjectile) {
+                        Entity shooter = ((EntityProjectile) killer).shootingEntity;
+                        if (shooter != null) {
+                            killer = shooter;
+                        }
+                        if (killer instanceof EntityHuman) {
+                            message += ".player";
+                            params.add(!Objects.equals(shooter.getNameTag(), "") ? shooter.getNameTag() : shooter.getName());
+                        }
                     }
-                    message = "death.attack.lava";
                     break;
 
                 case FIRE:
diff --git a/src/main/resources/lang b/src/main/resources/lang
index fdef28d8459..feb3be3d1b1 160000
--- a/src/main/resources/lang
+++ b/src/main/resources/lang
@@ -1 +1 @@
-Subproject commit fdef28d8459c0335701e07ebe5e113b3831da547
+Subproject commit feb3be3d1b17b23171c1d28d977aedbbdccef326