mirror of
https://github.com/AtlasMediaGroup/Scissors.git
synced 2024-11-16 18:46:12 +00:00
20 lines
980 B
Diff
20 lines
980 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Business Goose <arclicious@vivaldi.net>
|
|
Date: Fri, 3 Jun 2022 19:30:14 -0500
|
|
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 11d7c42d65b91bf57b7bba7812aa17e60e018c67..4d179230f712fbf2a8a8af9f0b7861fe2f83cbf7 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -623,7 +623,7 @@ public abstract class LivingEntity extends Entity {
|
|
|
|
protected void tickDeath() {
|
|
++this.deathTime;
|
|
- if (this.deathTime == 20 && !this.level.isClientSide()) {
|
|
+ if ((this.deathTime >= 20 || this.deathTime <= 0) && !this.level.isClientSide()) {
|
|
this.level.broadcastEntityEvent(this, (byte) 60);
|
|
this.remove(Entity.RemovalReason.KILLED);
|
|
}
|