diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index 492a5dccf8..51daec4090 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -50,7 +50,7 @@ public class Mechs implements ContentList{ @Override public void updateAlt(Player player){ - player.healBy(Time.delta() * 0.1f); + player.healBy(Time.delta() * 0.09f); } @Override diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java index c495475139..534d98093c 100644 --- a/core/src/io/anuke/mindustry/core/NetClient.java +++ b/core/src/io/anuke/mindustry/core/NetClient.java @@ -93,6 +93,7 @@ public class NetClient implements ApplicationListener{ Net.handleClient(Disconnect.class, packet -> { state.set(State.menu); connecting = false; + logic.reset(); Platform.instance.updateRPC(); if(quiet) return; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java index b9a0630102..3771f67ff7 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java @@ -292,6 +292,7 @@ public class JoinDialog extends FloatingDialog{ }); Time.runTask(2f, () -> { + logic.reset(); Vars.netClient.beginConnecting(); Net.connect(ip, port, () -> { hide(); diff --git a/core/src/io/anuke/mindustry/world/modules/ItemModule.java b/core/src/io/anuke/mindustry/world/modules/ItemModule.java index e3df51d758..7e146d8ab0 100644 --- a/core/src/io/anuke/mindustry/world/modules/ItemModule.java +++ b/core/src/io/anuke/mindustry/world/modules/ItemModule.java @@ -9,11 +9,8 @@ import java.util.Arrays; import static io.anuke.mindustry.Vars.content; public class ItemModule extends BlockModule{ - private static int lastID; - private int[] items = new int[content.items().size]; private int total; - private int id = lastID++; public void forEach(ItemConsumer cons){ for(int i = 0; i < items.length; i++){ @@ -119,8 +116,6 @@ public class ItemModule extends BlockModule{ @Override public void write(DataOutput stream) throws IOException{ - stream.writeInt(id); //unique ID - byte amount = 0; for(int item : items){ if(item > 0) amount++; @@ -138,7 +133,8 @@ public class ItemModule extends BlockModule{ @Override public void read(DataInput stream) throws IOException{ - id = stream.readInt(); + //just in case, reset items + Arrays.fill(items, 0); byte count = stream.readByte(); total = 0; @@ -150,14 +146,6 @@ public class ItemModule extends BlockModule{ } } - public int getID(){ - return id; - } - - public void setID(int id){ - this.id = id; - } - public interface ItemConsumer{ void accept(Item item, float amount); }