diff --git a/core/assets/version.properties b/core/assets/version.properties index 6aba3b2a3c..7dbcdf0698 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Mon Feb 19 15:07:31 EST 2018 +#Mon Feb 19 20:13:04 EST 2018 version=beta -androidBuildCode=247 +androidBuildCode=248 name=Mindustry code=3.3 build=custom build diff --git a/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java b/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java index 37fd1524f7..4e680e25bf 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java @@ -72,7 +72,7 @@ public class DebugFragment implements Fragment { }); row(); new button("time", () -> { - Timers.resetTime(1080000/2f); + Timers.resetTime(1080000 - 60*10); }); row(); new button("time2", () -> { diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java index 960fa8b276..177203884d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Junction.java @@ -37,7 +37,7 @@ public class Junction extends Block{ long l = buffer.items[0]; float time = NumberUtils.intBitsToFloat(Bits.getLeftInt(l)); - if(Timers.time() >= time + speed){ + if(Timers.time() >= time + speed || Timers.time() < time){ int val = Bits.getRightInt(l); @@ -91,6 +91,7 @@ public class Junction extends Block{ arr.add("nearby." + i); arr.add(tile.getNearby(i)); } + Consumer write = b -> { for(int i = 0; i < b.index; i++){ long l = b.items[i]; diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java index 2642d45624..16e51b0556 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java @@ -49,7 +49,7 @@ public class TunnelConveyor extends Block{ long l = entity.buffer[0]; float time = NumberUtils.intBitsToFloat(Bits.getLeftInt(l)); - if(Timers.time() >= time + speed){ + if(Timers.time() >= time + speed || Timers.time() < time){ Item item = Item.getByID(Bits.getRightInt(l));