aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0286-Don-t-process-despawn-if-entity-is-in-a-chunk-schedu.patch
blob: a09cd093faa17f18bc90ea3b57f6272d942d8be8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
From 11804fc6af089b140904ea3aaf81757aee10206b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 19 Jul 2018 01:23:00 -0400
Subject: [PATCH] Don't process despawn if entity is in a chunk scheduled for
 unload

This won't happen anyways if the user has
"skip ticking for entities in chunks scheduled for unload" turned on,
but if they don't, protect from this instant killing the entity to
keep it vanilla in behavior

a player may teleport away, and trigger instant despawn

diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 98e214cdd..ee5078370 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -634,6 +634,8 @@ public abstract class EntityInsentient extends EntityLiving {
         if (this.persistent) {
             this.ticksFarFromPlayer = 0;
         } else {
+            Chunk currentChunk = getChunkAtLocation(); // Paper
+            if (currentChunk != null && currentChunk.scheduledForUnload != null) return; // Paper
             EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D);
 
             if (entityhuman != null && entityhuman.affectsSpawning) { // Paper - Affects Spawning API
-- 
2.21.0