Better lighting

core/src/mindustry/core/NetServer.java

@@ -45,6 +45,8 @@ public class NetServer implements ApplicationListener{
         if(state.rules.pvp){
             //find team with minimum amount of players and auto-assign player to that.
             TeamData re = state.teams.getActive().min(data -> {
+                if(state.rules.waveTeam == data.team || !data.team.active()) return Integer.MAX_VALUE;
+
                 int count = 0;
                 for(Playerc other : players){
                     if(other.team() == data.team && other != player){

core/src/mindustry/graphics/LightRenderer.java

@@ -184,13 +184,14 @@ public class LightRenderer{
 
         Draw.color();
         buffer.beginDraw(Color.clear);
-        Draw.blend(Blending.normal);
+        Gl.blendEquationSeparate(Gl.funcAdd, Gl.max);
+
         for(Runnable run : lights){
             run.run();
         }
         Draw.reset();
-        Draw.blend();
         buffer.endDraw();
+        Gl.blendEquationSeparate(Gl.funcAdd, Gl.funcAdd);
 
         Draw.color();
         Shaders.light.ambient.set(state.rules.ambientLight);

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{

core/src/mindustry/world/blocks/distribution/OverflowGate.java

@@ -53,6 +53,11 @@ public class OverflowGate extends Block{
         }
 
         if(entity.lastItem != null){
+            if(entity.lastInput == null){
+                entity.lastItem = null;
+                return;
+            }
+
             entity.time += 1f / speed * Time.delta();
             Tile target = getTileTarget(tile, entity.lastItem, entity.lastInput, false);