mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Merge branch 'development' into 1.8
Conflicts: build.properties src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/tile/TileEntityBin.java src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java src/main/java/mekanism/generators/common/MekanismGenerators.java src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java src/main/java/mekanism/tools/common/MekanismTools.java
This commit is contained in:
commit
faad9762df
9 files changed
+134
-67
No files matched your search
@@ -4,10 +4,8 @@ import ic2.api.tile.IWrenchable;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.common.ITileComponent;
|
||||
@@ -33,10 +31,10 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench
|
||||
|
||||
public int clientFacing;
|
||||
|
||||
public Set<EntityPlayer> openedThisTick = Collections.synchronizedSet(new HashSet<EntityPlayer>());
|
||||
public HashSet<EntityPlayer> openedThisTick = new HashSet<EntityPlayer>();
|
||||
|
||||
/** The players currently using this block. */
|
||||
public Set<EntityPlayer> playersUsing = Collections.synchronizedSet(new HashSet<EntityPlayer>());
|
||||
public HashSet<EntityPlayer> playersUsing = new HashSet<EntityPlayer>();
|
||||
|
||||
/** A timer used to send packets to clients. */
|
||||
public int ticker;
|
||||
|
||||
Reference in new issue
Block a user