Merge pull request CloudburstMC#1087 from PowerNukkit/v1.4/death/mess…

…ages Fixes CloudburstMC#981 magma, lava, and starvation death messages
KCodeYT · May 26, 2021 · 50e35a9 · 50e35a9
2 parents bf36ff7 + bceae02
commit 50e35a9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git 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
+3 −1		bra/lang.ini
+3 −1		chs/lang.ini
+3 −1		cht/lang.ini
+3 −1		cze/lang.ini
+3 −1		deu/lang.ini
+3 −1		eng/lang.ini
+4 −2		fin/lang.ini
+3 −1		idn/lang.ini
+3 −1		jpn/lang.ini
+3 −1		kor/lang.ini
+3 −1		ltu/lang.ini
+3 −1		pol/lang.ini
+4 −2		rus/lang.ini
+3 −1		spa/lang.ini
+3 −1		tur/lang.ini
+4 −2		ukr/lang.ini
+3 −1		vie/lang.ini