it never ends

core/src/mindustry/io/MapIO.java

@@ -81,7 +81,7 @@ public class MapIO{
                 @Override
                 public void setBlock(Block type){
                     super.setBlock(type);
-                    int c = colorFor(Blocks.air, block(), Blocks.air, getTeam());
+                    int c = colorFor(Blocks.air, block(), Blocks.air, team());
                     if(c != black){
                         walls.draw(x, floors.getHeight() - 1 - y, c);
                         floors.draw(x, floors.getHeight() - 1 - y + 1, shade);
@@ -138,7 +138,7 @@ public class MapIO{
         for(int x = 0; x < pixmap.getWidth(); x++){
             for(int y = 0; y < pixmap.getHeight(); y++){
                 Tile tile = tiles.getn(x, y);
-                pixmap.draw(x, pixmap.getHeight() - 1 - y, colorFor(tile.floor(), tile.block(), tile.overlay(), tile.getTeam()));
+                pixmap.draw(x, pixmap.getHeight() - 1 - y, colorFor(tile.floor(), tile.block(), tile.overlay(), tile.team()));
             }
         }
         return pixmap;

core/src/mindustry/io/TypeIO.java

@@ -6,6 +6,7 @@ import mindustry.ctype.*;
 import mindustry.entities.bullet.*;
 import mindustry.entities.units.*;
 import mindustry.game.*;
+import mindustry.gen.*;
 import mindustry.net.Administration.*;
 import mindustry.net.Packets.*;
 import mindustry.type.*;
@@ -20,6 +21,16 @@ import static mindustry.Vars.*;
 @SuppressWarnings("unused")
 public class TypeIO{
 
+    @WriteClass(Entityc.class)
+    public static void writeEntity(ByteBuffer buffer, Entityc entity){
+        buffer.putInt(entity == null ? -1 : entity.id());
+    }
+
+    @ReadClass(Entityc.class)
+    public static <T extends Entityc> T readEntity(ByteBuffer buffer){
+        return (T)Groups.all.getByID(buffer.getInt());
+    }
+
     @WriteClass(Tile.class)
     public static void writeTile(ByteBuffer buffer, Tile tile){
         buffer.putInt(tile == null ? Pos.get(-1, -1) : tile.pos());

core/src/mindustry/io/versions/LegacyTypeTable.java

@@ -1,7 +1,6 @@
 package mindustry.io.versions;
 
 import arc.func.Prov;
-import mindustry.entities.effect.*;
 import mindustry.gen.*;
 import mindustry.entities.type.base.*;
 

core/src/mindustry/io/versions/Save2.java

@@ -3,7 +3,6 @@ package mindustry.io.versions;
 import mindustry.ctype.ContentType;
 import mindustry.entities.*;
 import mindustry.io.*;
-import mindustry.type.TypeID;
 
 import java.io.*;