2022-07-28 03:57:50 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2023-07-04 21:10:53 +00:00
|
|
|
From: Allink <arclicious@vivaldi.net>
|
|
|
|
Date: Mon, 18 Apr 2022 16:55:19 +0100
|
2022-07-28 03:57:50 +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
|
2023-07-04 21:10:53 +00:00
|
|
|
index 95a27d28f73039693ca64601954af62028413634..c62552b37d9dd8f0a50ab454af6090d876e0879f 100644
|
2022-07-28 03:57:50 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2023-03-16 03:57:35 +00:00
|
|
|
@@ -612,7 +612,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
2022-07-28 03:57:50 +00:00
|
|
|
|
|
|
|
protected void tickDeath() {
|
|
|
|
++this.deathTime;
|
2022-12-11 05:26:17 +00:00
|
|
|
- if (this.deathTime >= 20 && !this.level.isClientSide() && !this.isRemoved()) {
|
2023-07-04 21:10:53 +00:00
|
|
|
+ if ((this.deathTime >= 20 || this.deathTime <= 0) && !this.level.isClientSide() && !this.isRemoved()) { // Scissors
|
2022-07-28 03:57:50 +00:00
|
|
|
this.level.broadcastEntityEvent(this, (byte) 60);
|
|
|
|
this.remove(Entity.RemovalReason.KILLED);
|
|
|
|
}
|