From 0dad40ac19849061c28c9cb90efacb520226557c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 22 Jul 2021 03:29:10 -0500 Subject: [PATCH] Fix unkillable mobs --- patches/server/0082-Entity-lifespan.patch | 4 ++-- ...ix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename patches/server/{0234-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch => 0235-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch} (100%) diff --git a/patches/server/0082-Entity-lifespan.patch b/patches/server/0082-Entity-lifespan.patch index a98cd0e8f..1309de8ea 100644 --- a/patches/server/0082-Entity-lifespan.patch +++ b/patches/server/0082-Entity-lifespan.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 2c35070bc7c0a4195f824643c093df1c6aa59dfc..ea53ece9afe9e35323a88647901a83a4bf4225b8 100644 +index 2c35070bc7c0a4195f824643c093df1c6aa59dfc..76471484a47b2b6ff5293fe2b6afe1d5cd5aece0 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -126,6 +126,7 @@ public abstract class Mob extends LivingEntity { @@ -46,7 +46,7 @@ index 2c35070bc7c0a4195f824643c093df1c6aa59dfc..ea53ece9afe9e35323a88647901a83a4 + return; // mob persistent + } + if (ticksSinceLastInteraction > level.purpurConfig.entityLifeSpan) { -+ this.dead = true; ++ this.discard(); + } + } + diff --git a/patches/server/0234-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch b/patches/server/0235-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch similarity index 100% rename from patches/server/0234-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch rename to patches/server/0235-Fix-Important-Issue-Crash-with-Plugin-or-Datapack-Ge.patch