Merge remote-tracking branch 'origin/master'

core/src/mindustry/entities/Fires.java

@@ -15,7 +15,7 @@ public class Fires{
     private static final float baseLifetime = 1000f;
     private static final IntMap<Fire> map = new IntMap<>();
 
-    /** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */
+    /** Start a fire on the tile. If there already is a fire there, refreshes its lifetime. */
     public static void create(Tile tile){
         if(net.client() || tile == null || !state.rules.fire) return; //not clientside.
 

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

@@ -234,6 +234,12 @@ public class PayloadConveyor extends Block{
             updatePayload();
         }
 
+        @Override
+        public void onRemoved(){
+            super.onRemoved();
+            if(item != null) item.dump();
+        }
+
         @Override
         public void write(Writes write){
             super.write(write);

core/src/mindustry/world/blocks/production/PayloadAcceptor.java

@@ -82,6 +82,12 @@ public class PayloadAcceptor extends Block{
             return t;
         }
 
+        @Override
+        public void onRemoved(){
+            super.onRemoved();
+            if(payload != null) payload.dump();
+        }
+
         public boolean blends(int direction){
             return PayloadAcceptor.blends(this, direction);
         }