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

20 lines
1.0 KiB
Diff
Raw Normal View History

2022-07-28 03:57:50 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
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-10-15 22:45:13 +00:00
index b95f88d5e5b4785ee063695fd81935636a0588d1..168b002377e258f84a3bb86dd8e4a5f42060e3e0 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-07-06 21:13:45 +00:00
@@ -629,7 +629,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()) {
+ 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);
}