More branch merging

2021-10-14 20:58:03 -04:00
parent ad1c75d050
commit 6b59c1cd83
108 changed files with 1018 additions and 380 deletions
--- a/core/src/mindustry/entities/Units.java
+++ b/core/src/mindustry/entities/Units.java
@@ -129,7 +129,7 @@ public class Units{

        nearby(x, y, width, height, unit -> {
            if(boolResult) return;
-            if((unit.isGrounded() && !unit.type.hovering) == ground){
+            if((unit.isGrounded() && !unit.hovering) == ground){
                unit.hitboxTile(hitrect);

                if(hitrect.overlaps(x, y, width, height)){