Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-09-22 13:57:46 +03:00
Code Issues Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken 2019-08-14 10:27:10 -04:00
parent b6b9685d57
commit bf21c94bd7
9 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/overgrowth.msav
View File

Binary file not shown.

BIN
core/assets/maps/saltFlats.msav
View File

Binary file not shown.

2
core/src/io/anuke/mindustry/core/Logic.java
View File

@ -5,7 +5,7 @@ import io.anuke.annotations.Annotations.Remote;
import io.anuke.arc.ApplicationListener;
import io.anuke.arc.Events;
import io.anuke.arc.collection.ObjectSet.ObjectSetIterator;
import io.anuke.arc.util.Time;
import io.anuke.arc.util.*;
import io.anuke.mindustry.content.*;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.*;

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

@ -176,6 +176,7 @@ public class NetClient implements ApplicationListener{
public static void onKick(KickReason reason){
netClient.disconnectQuietly();
state.set(State.menu);
logic.reset();
if(!reason.quiet){
if(reason.extraText() != null){

1
core/src/io/anuke/mindustry/entities/EntityGroup.java
View File

@ -6,6 +6,7 @@ import io.anuke.arc.function.Consumer;
import io.anuke.arc.function.Predicate;
import io.anuke.arc.math.geom.QuadTree;
import io.anuke.arc.math.geom.Rectangle;
import io.anuke.arc.util.*;
import io.anuke.mindustry.entities.traits.Entity;
public class EntityGroup<T extends Entity>{

4
core/src/io/anuke/mindustry/game/SoundControl.java Normal file
View File

@ -0,0 +1,4 @@
package io.anuke.mindustry.game;
public class SoundControl{
}

2
core/src/io/anuke/mindustry/type/Zone.java
View File

@ -176,7 +176,7 @@ public class Zone extends UnlockableContent{
@Override
public void load(){
if(Core.files.internal("zones/" + name + ".png").exists()){
if(Core.files.internal("zones/" + name + ".png").exists() && !headless){
preview = new Texture(Core.files.internal("zones/" + name + ".png"));
}
}

2
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
View File

@ -108,6 +108,7 @@ public class PausedDialog extends FloatingDialog{
if(control.saves.getCurrent() == null || !control.saves.getCurrent().isAutosave() || state.rules.tutorial){
state.set(State.menu);
logic.reset();
return;
}
@ -119,6 +120,7 @@ public class PausedDialog extends FloatingDialog{
ui.showError("[accent]" + Core.bundle.get("savefail"));
}
state.set(State.menu);
logic.reset();
});
}
}

3
core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java
View File

@ -58,7 +58,7 @@ public class ZoneInfoDialog extends FloatingDialog{
rebuildItems.run();
cont.table(cont -> {
cont.pane(cont -> {
if(zone.locked()){
cont.addImage("icon-locked");
cont.row();
@ -138,6 +138,7 @@ public class ZoneInfoDialog extends FloatingDialog{
() -> loadout.show(zone.loadout.core().itemCapacity, zone::getStartingItems, zone::resetStartingItems, zone::updateLaunchCost, rebuildItems, item -> data.getItem(item) > 0 && item.type == ItemType.material)
).fillX().pad(3).disabled(b -> !zone.canConfigure());
}
cont.marginRight(12f);
});
cont.row();