From 724a0018b82e740abd8dd1d61178465b9e1e4cdb Mon Sep 17 00:00:00 2001
From: slava0135 <super.novalskiy_0135@inbox.ru>
Date: Sat, 28 Nov 2020 20:39:09 +0300
Subject: [PATCH] unit payload improvements

---
 .../world/blocks/distribution/PayloadConveyor.java  | 12 ++++++++++++
 .../world/blocks/production/PayloadAcceptor.java    | 13 +++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
index c2c014d969..edb9f87d47 100644
--- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
@@ -234,6 +234,18 @@ public class PayloadConveyor extends Block{
             updatePayload();
         }
 
+        @Override
+        public void onDestroyed() {
+            super.onDestroyed();
+            if (item != null) item.dump();
+        }
+
+        @Override
+        public void onRemoved() {
+            super.onRemoved();
+            if (item != null) item.dump();
+        }
+
         @Override
         public void write(Writes write){
             super.write(write);
diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java
index 512eeebdad..697f44ab85 100644
--- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java
+++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java
@@ -82,6 +82,18 @@ public class PayloadAcceptor extends Block{
             return t;
         }
 
+        @Override
+        public void onDestroyed() {
+            super.onDestroyed();
+            if (payload != null) payload.dump();
+        }
+
+        @Override
+        public void onRemoved() {
+            super.onRemoved();
+            if (payload != null) payload.dump();
+        }
+
         public boolean blends(int direction){
             return PayloadAcceptor.blends(this, direction);
         }
@@ -126,6 +138,7 @@ public class PayloadAcceptor extends Block{
             }
         }
 
+
         public void dumpPayload(){
             if(payload.dump()){
                 payload = null;