From c0ca134c5dfb658e51ae7b77f9e8f0bbe1d2f5a4 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 10 Sep 2020 22:20:20 -0400
Subject: [PATCH] Fixed #2537 (mostly)

---
 core/src/mindustry/graphics/FloorRenderer.java       |  2 +-
 core/src/mindustry/net/Net.java                      |  4 +++-
 .../world/blocks/defense/ForceProjector.java         | 12 +++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/src/mindustry/graphics/FloorRenderer.java b/core/src/mindustry/graphics/FloorRenderer.java
index 43c45ad221..268c4a9a88 100644
--- a/core/src/mindustry/graphics/FloorRenderer.java
+++ b/core/src/mindustry/graphics/FloorRenderer.java
@@ -228,7 +228,7 @@ public class FloorRenderer implements Disposable{
         int chunksx = Mathf.ceil((float)(world.width()) / chunksize),
         chunksy = Mathf.ceil((float)(world.height()) / chunksize);
         cache = new Chunk[chunksx][chunksy];
-        cbatch = new MultiCacheBatch(chunksize * chunksize * 5);
+        cbatch = new MultiCacheBatch(chunksize * chunksize * 6);
 
         Time.mark();
 
diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java
index 8993b84f83..3170a92617 100644
--- a/core/src/mindustry/net/Net.java
+++ b/core/src/mindustry/net/Net.java
@@ -152,7 +152,9 @@ public class Net{
     }
 
     public void disconnect(){
-        Log.info("Disconnecting.");
+        if(active && !server){
+            Log.info("Disconnecting.");
+        }
         provider.disconnectClient();
         server = false;
         active = false;
diff --git a/core/src/mindustry/world/blocks/defense/ForceProjector.java b/core/src/mindustry/world/blocks/defense/ForceProjector.java
index 43471574da..f401aff34b 100644
--- a/core/src/mindustry/world/blocks/defense/ForceProjector.java
+++ b/core/src/mindustry/world/blocks/defense/ForceProjector.java
@@ -83,8 +83,8 @@ public class ForceProjector extends Block{
         public ForceDraw drawer;
 
         @Override
-        public void add(){
-            super.add();
+        public void created(){
+            super.created();
             drawer = ForceDraw.create();
             drawer.build = this;
             drawer.set(x, y);
@@ -92,8 +92,8 @@ public class ForceProjector extends Block{
         }
 
         @Override
-        public void remove(){
-            super.remove();
+        public void onRemoved(){
+            super.onRemoved();
             drawer.remove();
         }
 
@@ -156,7 +156,9 @@ public class ForceProjector extends Block{
         public void draw(){
             super.draw();
 
-            drawer.set(x, y);
+            if(drawer != null){
+                drawer.set(x, y);
+            }
 
             if(buildup > 0f){
                 Draw.alpha(buildup / breakage * 0.75f);