Catch crazy velocity errors.

EngineHub · Jul 23, 2017 · d93785d · d93785d
1 parent 2ff610c
commit d93785d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/main/java/com/sk89q/craftbook/mechanics/boat/RemoveEntities.java b/src/main/java/com/sk89q/craftbook/mechanics/boat/RemoveEntities.java
@@ -14,6 +14,8 @@
 
 public class RemoveEntities extends AbstractCraftBookMechanic {
 
+    private static final Vector HALF_BLOCK_UP = new Vector(0, 0.5, 0);
+
     @EventHandler(priority = EventPriority.HIGH)
     public void onVehicleEntityCollision(VehicleEntityCollisionEvent event) {
 
@@ -31,7 +33,11 @@ public void onVehicleEntityCollision(VehicleEntityCollisionEvent event) {
             if(event.getEntity().isInsideVehicle())
                 return;
             ((LivingEntity) event.getEntity()).damage(10);
-            event.getEntity().setVelocity(event.getVehicle().getVelocity().normalize().multiply(1.8).add(new Vector(0,0.5,0)));
+            try {
+                event.getEntity().setVelocity(event.getVehicle().getVelocity().normalize().multiply(1.8).add(HALF_BLOCK_UP));
+            } catch(IllegalArgumentException e) {
+                event.getEntity().setVelocity(HALF_BLOCK_UP);
+            }
         } else if (event.getEntity() instanceof Vehicle) {
 
             if(!event.getEntity().isEmpty())