diff --git a/patches/minecraft/net/minecraft/world/World.java.patch b/patches/minecraft/net/minecraft/world/World.java.patch index 1af9726565..c4442227ac 100644 --- a/patches/minecraft/net/minecraft/world/World.java.patch +++ b/patches/minecraft/net/minecraft/world/World.java.patch @@ -576,7 +576,7 @@ - int l2 = 32; - if (p_72866_2_ && !this.func_175663_a(j2 - 32, 0, k2 - 32, j2 + 32, 0, k2 + 32, true)) -+ boolean isForced = getPersistentChunks().containsKey(new net.minecraft.util.math.ChunkPos(j2 >> 4, k2 >> 4)); ++ boolean isForced = !this.field_72995_K && getPersistentChunks().containsKey(new net.minecraft.util.math.ChunkPos(j2 >> 4, k2 >> 4)); + int range = isForced ? 0 : 32; + boolean canUpdate = !p_72866_2_ || this.func_175663_a(j2 - range, 0, k2 - range, j2 + range, 0, k2 + range, true); + if (!canUpdate) canUpdate = net.minecraftforge.event.ForgeEventFactory.canEntityUpdate(p_72866_1_); diff --git a/src/main/java/net/minecraftforge/common/ForgeChunkManager.java b/src/main/java/net/minecraftforge/common/ForgeChunkManager.java index e3710d186c..ed7f3a8690 100644 --- a/src/main/java/net/minecraftforge/common/ForgeChunkManager.java +++ b/src/main/java/net/minecraftforge/common/ForgeChunkManager.java @@ -22,6 +22,7 @@ package net.minecraftforge.common; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; @@ -29,6 +30,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.UUID; +import java.util.WeakHashMap; import javax.annotation.Nullable; @@ -104,7 +106,7 @@ public class ForgeChunkManager private static Map callbacks = Maps.newHashMap(); - private static Map> forcedChunks = new MapMaker().weakKeys().makeMap(); + private static Map> forcedChunks = Collections.synchronizedMap(new WeakHashMap<>()); private static BiMap pendingEntities = HashBiMap.create(); private static Map> dormantChunkCache = new MapMaker().weakKeys().makeMap(); @@ -613,13 +615,14 @@ public class ForgeChunkManager static void unloadWorld(World world) { + forcedChunks.remove(world); + // World save fires before this event so the chunk loading info will be done if (!(world instanceof WorldServer)) { return; } - forcedChunks.remove(world); if (dormantChunkCacheSize != 0) // only if in use { dormantChunkCache.remove(world); @@ -888,7 +891,9 @@ public class ForgeChunkManager */ public static ImmutableSetMultimap getPersistentChunksFor(World world) { - return forcedChunks.containsKey(world) ? forcedChunks.get(world) : ImmutableSetMultimap.of(); + if (world.isRemote) return ImmutableSetMultimap.of(); + ImmutableSetMultimap persistentChunks = forcedChunks.get(world); + return persistentChunks != null ? persistentChunks : ImmutableSetMultimap.of(); } static void saveWorld(World world)