Merge remote-tracking branch 'origin/master'

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

@@ -7,6 +7,7 @@ import arc.struct.*;
 import arc.util.*;
 import arc.util.io.*;
 import arc.util.pooling.*;
+import arc.util.pooling.Pool.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
@@ -68,7 +69,7 @@ public class Unloader extends Block{
         removeBar("items");
     }
 
-    public static class ContainerStat{
+    public static class ContainerStat implements Poolable{
         Building building;
         float loadFactor;
         boolean canLoad;
@@ -76,6 +77,11 @@ public class Unloader extends Block{
         /** Cached !(building instanceof StorageBuild) */
         boolean notStorage;
         int lastUsed;
+
+        @Override
+        public void reset(){
+            building = null;
+        }
     }
 
     public class UnloaderBuild extends Building{
@@ -255,4 +261,4 @@ public class Unloader extends Block{
             sortItem = id == -1 ? null : content.item(id);
         }
     }
-}
+}