2022-07-28 03:57:50 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2023-07-01 20:21:13 +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
|
2024-01-24 22:30:21 +00:00
|
|
|
index 6071451339080bbdd98fb634791a56988984c8bc..702dbcf60ba35a3427353ea27547dab4b4c11ecc 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-12-11 00:23:09 +00:00
|
|
|
@@ -628,7 +628,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
2022-07-28 03:57:50 +00:00
|
|
|
|
|
|
|
protected void tickDeath() {
|
|
|
|
++this.deathTime;
|
2023-06-09 00:58:46 +00:00
|
|
|
- if (this.deathTime >= 20 && !this.level().isClientSide() && !this.isRemoved()) {
|
2023-07-01 20:21:13 +00:00
|
|
|
+ if ((this.deathTime >= 20 || this.deathTime <= 0) && !this.level().isClientSide() && !this.isRemoved()) { // Scissors
|
2023-06-09 00:58:46 +00:00
|
|
|
this.level().broadcastEntityEvent(this, (byte) 60);
|
2022-07-28 03:57:50 +00:00
|
|
|
this.remove(Entity.RemovalReason.KILLED);
|
|
|
|
}
|