Merge remote-tracking branch 'origin/master'

core/src/mindustry/entities/Damage.java

@@ -108,7 +108,7 @@ public class Damage{
         furthest = null;
 
         boolean found = world.raycast(b.tileX(), b.tileY(), World.toTile(b.x + Tmp.v1.x), World.toTile(b.y + Tmp.v1.y),
-        (x, y) -> (furthest = world.tile(x, y)) != null && furthest.team() != b.team && furthest.block().absorbLasers);
+        (x, y) -> (furthest = world.tile(x, y)) != null && furthest.team() != b.team && (furthest.build != null && furthest.build.absorbLasers()));
 
         return found && furthest != null ? Math.max(6f, b.dst(furthest.worldx(), furthest.worldy())) : length;
     }

core/src/mindustry/entities/Lightning.java

@@ -53,7 +53,7 @@ public class Lightning{
                 world.raycastEach(World.toTile(from.getX()), World.toTile(from.getY()), World.toTile(to.getX()), World.toTile(to.getY()), (wx, wy) -> {
 
                     Tile tile = world.tile(wx, wy);
-                    if(tile != null && tile.block().insulated && tile.team() != team){
+                    if(tile != null && (tile.build != null && tile.build.isInsulated()) && tile.team() != team){
                         bhit = true;
                         //snap it instead of removing
                         lines.get(lines.size - 1).set(wx * tilesize, wy * tilesize);

core/src/mindustry/entities/comp/BuildingComp.java

@@ -1241,6 +1241,14 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return amount;
     }
 
+    public boolean absorbLasers(){
+        return block.absorbLasers;
+    }
+
+    public boolean isInsulated(){
+        return block.insulated;
+    }
+
     public boolean collide(Bullet other){
         return true;
     }

core/src/mindustry/entities/comp/PuddleComp.java

@@ -60,7 +60,7 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc{
         accepting = 0f;
 
         if(amount >= maxLiquid / 1.5f){
-            float deposited = Math.min((amount - maxLiquid / 1.5f) / 4f, 0.3f) * Time.delta;
+            float deposited = Math.min((amount - maxLiquid / 1.5f) / 4f, 0.3f * Time.delta);
             int targets = 0;
             for(Point2 point : Geometry.d4){
                 Tile other = world.tile(tile.x + point.x, tile.y + point.y);

core/src/mindustry/world/blocks/power/PowerNode.java

@@ -348,7 +348,7 @@ public class PowerNode extends PowerBlock{
     public static boolean insulated(int x, int y, int x2, int y2){
         return world.raycast(x, y, x2, y2, (wx, wy) -> {
             Building tile = world.build(wx, wy);
-            return tile != null && tile.block.insulated;
+            return tile != null && tile.isInsulated();
         });
     }
 

servers_v6.json

@@ -60,8 +60,8 @@
     "address": ["yeeth.mindustry.me:2004","185.86.230.61:25570"] 
   },
   {
-    "name": "md.obvilionnetwork.ru",
+    "name": "Obvilion Network",
-    "address": ["obvilionnetwork.ru", "obvilionnetwork.ru:7001", "obvilionnetwork.ru:7002", "obvilionnetwork.ru:7003"]
+    "address": ["obvilion.ru", "obvilion.ru:7001", "obvilion.ru:7002", "obvilion.ru:7003"]
   },
   {
     "name": "Mindustry PLAY",
@@ -113,7 +113,7 @@
   },
   {
     "name": "NukeDustry",
-    "address": ["nukedustry.tk", "nukedustry.tk:6568"]
+    "address": ["nukedustry.tk:7777", "nukedustry.tk:8888"]
   },
   {
     "name": "MindustryBR",

servers_v7.json

@@ -33,7 +33,7 @@
   },
   {
     "name": "Obvilion Network",
-    "address": ["obvilionnetwork.ru:7004", "obvilionnetwork.ru:7005"]
+    "address": ["obvilion.ru:7004", "obvilion.ru:7005"]
   },
   {
     "name": "io",
@@ -50,5 +50,9 @@
   {
     "name": "Shiza Minigames",
     "address": ["shizashizashiza.ml"]
+  },
+  { 
+    "name": "devass.su",
+    "address": ["185.22.152.66"]
   }
 ]