Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

2021-12-21 10:39:49 -05:00
parent fb09d6bca0 2dfa238ff3
commit 45b81fae37
12 changed files with 52 additions and 18 deletions
--- a/core/src/mindustry/world/blocks/production/Drill.java
+++ b/core/src/mindustry/world/blocks/production/Drill.java
@@ -169,7 +169,7 @@ public class Drill extends Block{
        return new TextureRegion[]{region, rotatorRegion, topRegion};
    }

-    void countOre(Tile tile){
+    protected void countOre(Tile tile){
        returnItem = null;
        returnCount = 0;