From 1d754b010afd7d35014c1861d46325dc71f6b506 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 23 Nov 2017 23:48:21 -0600 Subject: [PATCH] Fix lurking race condition in TileCorporeaIndex --- .../core/handler/ClientTickHandler.java | 1 - .../tile/corporea/TileCorporeaIndex.java | 32 ++++++++++++------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 1d5fbf0c0..befd7ab2b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -65,7 +65,6 @@ public final class ClientTickHandler { if(Minecraft.getMinecraft().world == null) { ManaNetworkHandler.instance.clear(); - TileCorporeaIndex.indexes.clear(); SubTileVinculotus.existingFlowers.clear(); } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index 57d193f98..13d56c340 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.tile.corporea; import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; @@ -34,7 +33,6 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.lib.LibMisc; -import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; @@ -43,13 +41,15 @@ import java.util.Set; import java.util.WeakHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor { public static final double RADIUS = 2.5; private static InputHandler input; - public static final Set indexes = Collections.newSetFromMap(new WeakHashMap<>()); + private static final Set serverIndexes = Collections.newSetFromMap(new WeakHashMap<>()); + private static final Set clientIndexes = Collections.newSetFromMap(new WeakHashMap<>()); private static final Map patterns = new LinkedHashMap<>(); @@ -173,20 +173,20 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ } else if(closeby > 0F) closeby -= step; - if(!isInvalid() && !indexes.contains(this)) - indexes.add(this); + if(!isInvalid()) + addIndex(this); } @Override public void invalidate() { super.invalidate(); - indexes.remove(this); + removeIndex(this); } @Override public void onChunkUnload() { super.onChunkUnload(); - indexes.remove(this); + removeIndex(this); } @Override @@ -231,6 +231,16 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ return input; } + private static void addIndex(TileCorporeaIndex index) { + Set set = index.world.isRemote ? clientIndexes : serverIndexes; + set.add(index); + } + + private static void removeIndex(TileCorporeaIndex index) { + Set set = index.world.isRemote ? clientIndexes : serverIndexes; + set.remove(index); + } + public static final class InputHandler implements ICorporeaAutoCompleteController { public InputHandler() { @@ -280,11 +290,9 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ } public static List getNearbyIndexes(EntityPlayer player) { - List indexList = new ArrayList<>(); - for(TileCorporeaIndex index : indexes) - if(isInRangeOfIndex(player, index) && index.world.isRemote == player.world.isRemote) - indexList.add(index); - return indexList; + return (player.world.isRemote ? clientIndexes : serverIndexes) + .stream().filter(i -> isInRangeOfIndex(player, i)) + .collect(Collectors.toList()); } @Override