Merge remote-tracking branch 'origin/master'

core/src/mindustry/input/InputHandler.java

@@ -469,7 +469,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         build.updateProximity();
         build.noSleep();
         Fx.rotateBlock.at(build.x, build.y, build.block.size);
-        Events.fire(new BuildRotateEvent(build, player.unit(), previous));
+        Events.fire(new BuildRotateEvent(build, player == null ? null : player.unit(), previous));
     }
 
     @Remote(targets = Loc.both, called = Loc.both, forward = true)

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

@@ -36,6 +36,7 @@ public class ImpactReactor extends PowerGenerator{
         explosionShake = 6f;
         explosionShakeDuration = 16f;
         explosionDamage = 1900 * 4;
+        explosionMinWarmup = 0.3f;
         explodeEffect = Fx.impactReactorExplosion;
         explodeSound = Sounds.explosionbig;
     }
@@ -110,13 +111,6 @@ public class ImpactReactor extends PowerGenerator{
             return super.sense(sensor);
         }
 
-        @Override
-        public void createExplosion(){
-            if(warmup >= 0.3f){
-                super.createExplosion();
-            }
-        }
-
         @Override
         public void write(Writes write){
             super.write(write);

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

@@ -128,10 +128,8 @@ public class NuclearReactor extends PowerGenerator{
         }
 
         @Override
-        public void createExplosion(){
-            if(items.get(fuelItem) >= 5 || heat >= 0.5f){
-                super.createExplosion();
-            }
+        public boolean shouldExplode(){
+            return super.shouldExplode() && (items.get(fuelItem) >= 5 || heat >= 0.5f);
         }
 
         @Override