fix: colliding with a small object doesn't cause the game to crash

Suportik-GFX · Aug 17, 2020 · 517607c · 517607c
1 parent 0ec6a7f
commit 517607c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/engine/src/main/java/org/destinationsol/game/input/SmallObjAvoider.java b/engine/src/main/java/org/destinationsol/game/input/SmallObjAvoider.java
@@ -23,8 +23,10 @@
 import org.destinationsol.common.SolMath;
 import org.destinationsol.game.SolGame;
 import org.destinationsol.game.SolObject;
+import org.destinationsol.game.SolObjectEntityWrapper;
 import org.destinationsol.game.planet.Planet;
 import org.destinationsol.game.ship.SolShip;
+import org.terasology.gestalt.entitysystem.entity.EntityRef;
 
 public class SmallObjAvoider {
     public static final float MANEUVER_TIME = 2f;
@@ -85,7 +87,11 @@ public float avoid(SolGame game, SolShip ship, float toDestAngle, Planet np) {
     private class MyRayBack implements RayCastCallback {
         @Override
         public float reportRayFixture(Fixture fixture, Vector2 point, Vector2 normal, float fraction) {
-            SolObject o = (SolObject) fixture.getBody().getUserData();
+            Object data = fixture.getBody().getUserData();
+            if (data instanceof EntityRef) {
+                data = new SolObjectEntityWrapper((EntityRef) data);
+            }
+            SolObject o = (SolObject) data;
             if (myShip == o) {
                 return -1;
             }