2022-04-19 10:56:30 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Business Goose <arclicious@vivaldi.net>
|
|
|
|
Date: Mon, 18 Apr 2022 16:55:19 +0100
|
|
|
|
Subject: [PATCH] Fix negative death times
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2022-04-20 00:05:57 +00:00
|
|
|
index 1521f53ee1bd85ca44a68b2c9d969eaf63fa342e..64cfd7281b909e51321167a7f65d66b3ca8f9bc3 100644
|
2022-04-19 10:56:30 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2022-04-20 00:05:57 +00:00
|
|
|
@@ -620,7 +620,7 @@ public abstract class LivingEntity extends Entity {
|
|
|
|
|
2022-04-19 10:56:30 +00:00
|
|
|
protected void tickDeath() {
|
|
|
|
++this.deathTime;
|
|
|
|
- if (this.deathTime >= 20 && !this.isRemoved() && !this.level.isClientSide()) { // CraftBukkit - (this.deathTicks == 20) -> (this.deathTicks >= 20 && !this.dead)
|
|
|
|
+ if ((this.deathTime >= 20 || this.deathTime <= 0) && !this.isRemoved() && !this.level.isClientSide()) { // CraftBukkit - (this.deathTicks == 20) -> (this.deathTicks >= 20 && !this.dead)
|
|
|
|
this.level.broadcastEntityEvent(this, (byte) 60);
|
|
|
|
this.remove(Entity.RemovalReason.KILLED);
|
|
|
|
}
|