Fixed #2282

core/src/mindustry/content/UnitTypes.java

@@ -575,23 +575,6 @@ public class UnitTypes implements ContentList{
 
             mineTier = 1;
             mineSpeed = 2.5f;
-
-            //no weapon, mining only
-            /*
-            weapons.add(new Weapon(){{
-                y = 1.5f;
-                x = 0f;
-
-                reload = 40f;
-                ejectEffect = Fx.none;
-                recoil = 2f;
-                shootSound = Sounds.pew;
-                mirror = false;
-
-                bullet = new HealBulletType(5.2f, 10){{
-                    healPercent = 4f;
-                }};
-            }});*/
         }};
 
         poly = new UnitType("poly"){{

core/src/mindustry/ui/dialogs/ResearchDialog.java

@@ -76,6 +76,9 @@ public class ResearchDialog extends BaseDialog{
                     if(amount < 0){
                         //remove items from each sector's storage, one by one
 
+                        //negate amount since it's being *removed*
+                        amount = -amount;
+
                         //% that gets removed from each sector
                         double percentage = (double)amount / get(item);
                         int[] counter = {amount};
@@ -90,6 +93,9 @@ public class ResearchDialog extends BaseDialog{
                             seq.remove(item, toRemove);
                             counter[0] -= toRemove;
                         });
+
+                        //negate again to display correct number
+                        amount = -amount;
                     }
 
                     super.add(item, amount);
@@ -402,6 +408,9 @@ public class ResearchDialog extends BaseDialog{
             }
 
             node.save();
+
+            //??????
+            Core.scene.act();
             rebuild(shine);
             itemDisplay.rebuild(items, usedShine);
         }

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

@@ -146,17 +146,16 @@ public class ItemBridge extends Block{
         public void drawSelect(){
             if(linkValid(tile, world.tile(link))){
                 drawInput(world.tile(link));
-            }else{
-                incoming.each(pos -> drawInput(world.tile(pos)));
             }
 
+            incoming.each(pos -> drawInput(world.tile(pos)));
+
             Draw.reset();
         }
 
         private void drawInput(Tile other){
             if(!linkValid(tile, other, false)) return;
             boolean linked = other.pos() == link;
-            if(!linked && !(other.<ItemBridgeEntity>bc().link == tile.pos())) return;
 
             Tmp.v2.trns(tile.angleTo(other), 2f);
             float tx = tile.drawx(), ty = tile.drawy();

core/src/mindustry/world/blocks/storage/CoreBlock.java

@@ -97,6 +97,7 @@ public class CoreBlock extends StorageBlock{
 
     @Override
     public boolean canPlaceOn(Tile tile, Team team){
+        if(tile == null) return false;
         CoreEntity core = team.core();
         //must have all requirements
         if(core == null || (!state.rules.infiniteResources && !core.items.has(requirements))) return false;
@@ -138,7 +139,9 @@ public class CoreBlock extends StorageBlock{
 
     @Override
     public void drawPlace(int x, int y, int rotation, boolean valid){
-        if(!canPlaceOn(world.tile(x, y),player.team())){
+        if(world.tile(x, y) == null) return;
+
+        if(!canPlaceOn(world.tile(x, y), player.team())){
 
             drawPlaceText(Core.bundle.get((player.team().core() != null && player.team().core().items.has(requirements) && !state.rules.infiniteResources) ?
                 "bar.corereq" :