From 8600b756915b82163d04ddca9e8973836b17aec7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 22 Jun 2016 18:41:21 -0500 Subject: [PATCH] Fix solegnolia not working on dediserver and threadsafe the collection. Fixes #346 --- .../common/block/subtile/functional/SubTileSolegnolia.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 36ca0c765..232d0b234 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.subtile.functional; +import com.google.common.collect.MapMaker; import net.minecraft.entity.Entity; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -25,7 +26,7 @@ public class SubTileSolegnolia extends SubTileFunctional { private static final double RANGE = 5; private static final double RANGE_MINI = 1; - private static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); + private static final Set existingFlowers = Collections.newSetFromMap(new MapMaker().concurrencyLevel(2).weakKeys().makeMap()); @Override public void onUpdate() { @@ -44,7 +45,7 @@ public class SubTileSolegnolia extends SubTileFunctional { public static boolean hasSolegnoliaAround(Entity e) { return existingFlowers.stream() .filter(f -> f.redstoneSignal == 0) - .filter(f -> f.supertile.getWorld() != e.worldObj) + .filter(f -> f.supertile.getWorld() == e.worldObj) .filter(f -> f.supertile.getWorld().getTileEntity(f.supertile.getPos()) == f.supertile) .filter(f -> f.supertile.getDistanceSq(e.posX, e.posY, e.posZ) <= f.getRange() * f.getRange()) .findAny().isPresent();