Merge remote-tracking branch 'origin/master'

2023-06-16 13:19:57 -04:00
parent 58cd1852f1 500f22b1d0
commit 017aa71da8
47 changed files with 217 additions and 198 deletions
--- a/core/src/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java
@@ -593,11 +593,6 @@ public class CoreBlock extends StorageBlock{

            state.teams.unregisterCore(this);

-            int max = itemCapacity * state.teams.cores(team).size;
-            for(Item item : content.items()){
-                items.set(item, Math.min(items.get(item), max));
-            }
-
            for(CoreBuild other : state.teams.cores(team)){
                other.onProximityUpdate();
            }