mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-09 13:28:36 +02:00
a2ad49b22f
Note to other developers: This commit may require you to wipe your workspace as a result of the changes to BD. --- work/BuildData Submodule work/BuildData f527a8ff..d56672db: > Mappings Update --- work/Bukkit Submodule work/Bukkit 0c1d258bb..db06c80d7: > Add list of entities to EntityTransformEvent > SPIGOT-4347: Add API to allow storing arbitrary values on ItemStacks ---work/CraftBukkit Submodule work/CraftBukkit 6a398ac44..068dab5be: > Enable optional source JAR shading via profile shadeSourcesJar > Use ImmutableList rather than AbstractList for CraftMetaBook > Fix setRecipes(List) not setting Knowledge Book recipes. > Mappings Update > Add list of entities to EntityTransformEvent & move die calls > SPIGOT-4347: Add API to allow storing arbitrary values on ItemStacks > Add Vanilla help to default permissions --- work/Spigot Submodule work/Spigot a1f2566f6..e769fe4d9: > Mappings Update > Rebuild patches
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
From cbad86f2de8d4863753c51a2eb06ee6fb8a8230a 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 a28aa016c..d92b6a6ea 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
@@ -633,6 +633,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.19.2
|
|
|