mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-12 03:37:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed core inventory persistence bug

Browse Source
This commit is contained in:
Anuken 2019-04-14 10:18:18 -04:00
parent d1ec652f7b
commit 084ae184f9
4 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/content/Mechs.java
View File

@ -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

1
core/src/io/anuke/mindustry/core/NetClient.java
View File

@ -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;

1
core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
View File

@ -292,6 +292,7 @@ public class JoinDialog extends FloatingDialog{
});
Time.runTask(2f, () -> {
logic.reset();
Vars.netClient.beginConnecting();
Net.connect(ip, port, () -> {
hide();

16
core/src/io/anuke/mindustry/world/modules/ItemModule.java
View File

@ -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);
}