mirror of
https://github.com/AtlasMediaGroup/Scissors.git
synced 2024-11-16 18:46:12 +00:00
871cc5653c
* Clean up command block event patch * Merge resource location patches * Merge map decoration patches * Merge Video's resource location patches * Merge large tag reset patches
20 lines
1.0 KiB
Diff
20 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Telesphoreo <me@telesphoreo.me>
|
|
Date: Thu, 8 Jun 2023 19:24:05 -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 a189461330a4d427a7450d504ef13de3605497e3..79430aef1cbcad7d872435ebdec60321e2573bb3 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -630,7 +630,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
|
|
protected void tickDeath() {
|
|
++this.deathTime;
|
|
- if (this.deathTime >= 20 && !this.level().isClientSide() && !this.isRemoved()) {
|
|
+ if ((this.deathTime >= 20 || this.deathTime <= 0) && !this.level().isClientSide() && !this.isRemoved()) {
|
|
this.level().broadcastEntityEvent(this, (byte) 60);
|
|
this.remove(Entity.RemovalReason.KILLED);
|
|
}
|