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

Fixed #2537 (mostly)

Browse Source
This commit is contained in:
Anuken
2020-09-10 22:20:20 -04:00
parent e6eb847d81
commit c0ca134c5d
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/graphics/FloorRenderer.java
View File

@@ -228,7 +228,7 @@ public class FloorRenderer implements Disposable{
int chunksx = Mathf.ceil((float)(world.width()) / chunksize), int chunksx = Mathf.ceil((float)(world.width()) / chunksize),
chunksy = Mathf.ceil((float)(world.height()) / chunksize); chunksy = Mathf.ceil((float)(world.height()) / chunksize);
cache = new Chunk[chunksx][chunksy]; cache = new Chunk[chunksx][chunksy];
cbatch = new MultiCacheBatch(chunksize * chunksize * 5); cbatch = new MultiCacheBatch(chunksize * chunksize * 6);
Time.mark(); Time.mark();

4
core/src/mindustry/net/Net.java
View File

@@ -152,7 +152,9 @@ public class Net{
} }
public void disconnect(){ public void disconnect(){
Log.info("Disconnecting."); if(active && !server){
Log.info("Disconnecting.");
}
provider.disconnectClient(); provider.disconnectClient();
server = false; server = false;
active = false; active = false;

12
core/src/mindustry/world/blocks/defense/ForceProjector.java
View File

@@ -83,8 +83,8 @@ public class ForceProjector extends Block{
public ForceDraw drawer; public ForceDraw drawer;
@Override @Override
public void add(){ public void created(){
super.add(); super.created();
drawer = ForceDraw.create(); drawer = ForceDraw.create();
drawer.build = this; drawer.build = this;
drawer.set(x, y); drawer.set(x, y);
@@ -92,8 +92,8 @@ public class ForceProjector extends Block{
} }
@Override @Override
public void remove(){ public void onRemoved(){
super.remove(); super.onRemoved();
drawer.remove(); drawer.remove();
} }
@@ -156,7 +156,9 @@ public class ForceProjector extends Block{
public void draw(){ public void draw(){
super.draw(); super.draw();
drawer.set(x, y); if(drawer != null){
drawer.set(x, y);
}
if(buildup > 0f){ if(buildup > 0f){
Draw.alpha(buildup / breakage * 0.75f); Draw.alpha(buildup / breakage * 0.75f);