Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc cleanup

Browse Source
This commit is contained in:
Anuken
2022-10-02 22:08:54 -04:00
parent 27848bbc9f
commit cc3c358cc2
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/campaign/Accelerator.java
View File

@@ -110,7 +110,7 @@ public class Accelerator extends Block{
if(!state.isCampaign() || efficiency <= 0f) return; if(!state.isCampaign() || efficiency <= 0f) return;
ui.showInfo("This block doesn't work properly in the beta/alpha. It maybe removed, or reworked. Check back in a later update."); ui.showInfo("This block doesn't work properly in the beta/alpha. It may be removed, or reworked. Check back in a later update.");
if(false) if(false)
ui.planet.showPlanetLaunch(state.rules.sector, sector -> { ui.planet.showPlanetLaunch(state.rules.sector, sector -> {

9
core/src/mindustry/world/blocks/power/PowerNode.java
View File

@@ -26,9 +26,8 @@ public class PowerNode extends PowerBlock{
protected static BuildPlan otherReq; protected static BuildPlan otherReq;
protected static int returnInt = 0; protected static int returnInt = 0;
protected final static ObjectSet<PowerGraph> graphs = new ObjectSet<>(); protected final static ObjectSet<PowerGraph> graphs = new ObjectSet<>();
/** The maximum range of all power nodes on the map */ /** The maximum range of all power nodes on the map */
public static float maxRange; protected static float maxRange;
public @Load("laser") TextureRegion laser; public @Load("laser") TextureRegion laser;
public @Load("laser-end") TextureRegion laserEnd; public @Load("laser-end") TextureRegion laserEnd;
@@ -92,14 +91,12 @@ public class PowerNode extends PowerBlock{
//clear old //clear old
for(int i = 0; i < old.size; i++){ for(int i = 0; i < old.size; i++){
int cur = old.get(i); configurations.get(Integer.class).get(tile, old.get(i));
configurations.get(Integer.class).get(tile, cur);
} }
//set new //set new
for(Point2 p : value){ for(Point2 p : value){
int newPos = Point2.pack(p.x + tile.tileX(), p.y + tile.tileY()); configurations.get(Integer.class).get(tile, Point2.pack(p.x + tile.tileX(), p.y + tile.tileY()));
configurations.get(Integer.class).get(tile, newPos);
} }
}); });
} }