Skip to content

Commit 50e35a9

Browse files
authored
Merge pull request CloudburstMC#1087 from PowerNukkit/v1.4/death/messages
Fixes CloudburstMC#981 magma, lava, and starvation death messages
2 parents bf36ff7 + bceae02 commit 50e35a9

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4488,10 +4488,20 @@ public void kill() {
44884488
case LAVA:
44894489
Block block = this.level.getBlock(new Vector3(this.x, this.y - 1, this.z));
44904490
if (block.getId() == Block.MAGMA) {
4491-
message = "death.attack.lava.magma";
4492-
break;
4491+
message = "death.attack.magma";
4492+
} else {
4493+
message = "death.attack.lava";
4494+
}
4495+
if (killer instanceof EntityProjectile) {
4496+
Entity shooter = ((EntityProjectile) killer).shootingEntity;
4497+
if (shooter != null) {
4498+
killer = shooter;
4499+
}
4500+
if (killer instanceof EntityHuman) {
4501+
message += ".player";
4502+
params.add(!Objects.equals(shooter.getNameTag(), "") ? shooter.getNameTag() : shooter.getName());
4503+
}
44934504
}
4494-
message = "death.attack.lava";
44954505
break;
44964506

44974507
case FIRE:

0 commit comments

Comments
 (0)