Fixed core errors

2020-03-06 15:22:13 -05:00
parent 4358658889
commit 77f406e9b8
33 changed files with 97 additions and 112 deletions
--- a/core/src/mindustry/entities/def/UnitComp.java
+++ b/core/src/mindustry/entities/def/UnitComp.java
@@ -126,7 +126,9 @@ abstract class UnitComp implements Healthc, Velc, Statusc, Teamc, Itemsc, Hitbox

        if(tile != null){
            //unit block update
-            tile.unitOn(this);
+            if(tile.entity != null){
+                tile.entity.unitOn(this);
+            }

            //apply damage
            if(floor.damageTaken > 0f){