diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-06-20 08:38:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-20 08:38:30 +0200 |
| commit | 26daba91e958c3b490b311a5a3a5783a32bc8296 (patch) | |
| tree | 8a258dcb410e187438c815ab5bf4de49830bb83e | |
| parent | fe2b44eca36f55a2aa24fcc3d799d43845cb285b (diff) | |
| parent | ab259fbf7c5cd19ff1dbf7038ffafdbf8a38e0a7 (diff) | |
| download | GT5-Unofficial-26daba91e958c3b490b311a5a3a5783a32bc8296.tar.gz GT5-Unofficial-26daba91e958c3b490b311a5a3a5783a32bc8296.tar.bz2 GT5-Unofficial-26daba91e958c3b490b311a5a3a5783a32bc8296.zip | |
Merge pull request #568 from queer/queer-patch-1
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_SpawnEventHandler.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/util/GT_SpawnEventHandler.java b/src/main/java/gregtech/api/util/GT_SpawnEventHandler.java index 9063b1f7c9..0e29950dbd 100644 --- a/src/main/java/gregtech/api/util/GT_SpawnEventHandler.java +++ b/src/main/java/gregtech/api/util/GT_SpawnEventHandler.java @@ -9,12 +9,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent.CheckSpawn; -import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; public class GT_SpawnEventHandler { - public static volatile List<int[]> mobReps = new ArrayList(); + public static volatile List<int[]> mobReps = new CopyOnWriteArrayList<>(); public GT_SpawnEventHandler() { MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java index 095c87f948..1e1beaf528 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MonsterRepellent.java @@ -10,6 +10,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import java.util.Arrays; + import static gregtech.api.enums.GT_Values.V; import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TELEPORTER; @@ -75,7 +77,7 @@ public class GT_MetaTileEntity_MonsterRepellent extends GT_MetaTileEntity_Tiered @Override public void onRemoval() { int[] tCoords = {this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord(), this.getBaseMetaTileEntity().getWorld().provider.dimensionId}; - GT_SpawnEventHandler.mobReps.remove(tCoords); + GT_SpawnEventHandler.mobReps.removeIf(coords -> Arrays.equals(coords, tCoords)); } @Override |