Merge remote-tracking branch 'origin/master'

core/src/mindustry/net/Administration.java

@@ -568,6 +568,7 @@ public class Administration{
             player = null;
             type = null;
             tile = null;
+            block = null;
         }
     }
 

core/src/mindustry/ui/fragments/ChatFragment.java

@@ -231,6 +231,8 @@ public class ChatFragment extends Table{
 
         fadetime += 1f;
         fadetime = Math.min(fadetime, messagesShown) + 1f;
+        
+        if(scrollPos > 0) scrollPos++;
     }
 
     private static class ChatMessage{