Scissors/patches/server/0018-Fix-negative-death-times.patch

21 lines
1.2 KiB
Diff
Raw Normal View History

2022-04-19 10:56:30 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Fri, 22 Apr 2022 00:49:51 -0500
2022-04-19 10:56:30 +00:00
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
index 1521f53ee1bd85ca44a68b2c9d969eaf63fa342e..12e5d00bab016e4e46527719045c63c2d10d7ea7 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
@@ -620,8 +620,7 @@ public abstract class LivingEntity extends Entity {
2022-04-20 00:05:57 +00:00
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)
- this.level.broadcastEntityEvent(this, (byte) 60);
+ 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);
2022-04-19 10:56:30 +00:00
this.remove(Entity.RemovalReason.KILLED);
}