mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Merge branch 'v9' into 1.8.9
This commit is contained in:
commit
ac39b6fabe
78 files changed
+1059
-905
No files matched your search
@@ -9,7 +9,6 @@ import java.util.Iterator;
|
||||
import java.util.Set;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.common.tile.TileEntityTeleporter;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -247,12 +246,12 @@ public class FrequencyManager
|
||||
else {
|
||||
TileEntity tile = coord.getTileEntity(world);
|
||||
|
||||
if(!(tile instanceof TileEntityTeleporter))
|
||||
if(!(tile instanceof IFrequencyHandler))
|
||||
{
|
||||
iter.remove();
|
||||
}
|
||||
else {
|
||||
Frequency freq = ((TileEntityTeleporter)tile).frequency;
|
||||
Frequency freq = ((IFrequencyHandler)tile).getFrequency();
|
||||
|
||||
if(freq == null || !freq.equals(iterFreq))
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user