From 30ae87d0f37d12b71ed07adc230e6a4d67115977 Mon Sep 17 00:00:00 2001
From: Unknown <lemadec.fr@gmail.com>
Date: Sat, 9 Dec 2017 14:26:44 +0100
Subject: [PATCH] Fixed world loading when falling from space

---
 .../cr0s/warpdrive/event/LivingHandler.java   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cr0s/warpdrive/event/LivingHandler.java b/src/main/java/cr0s/warpdrive/event/LivingHandler.java
index ccddc98e..28745a55 100644
--- a/src/main/java/cr0s/warpdrive/event/LivingHandler.java
+++ b/src/main/java/cr0s/warpdrive/event/LivingHandler.java
@@ -19,6 +19,7 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
@@ -160,7 +161,23 @@ public class LivingHandler {
 			  && !celestialObject.isHyperspace()
 			  && celestialObjectChild.isInOrbit(entityLivingBase.worldObj.provider.dimensionId, x, z) ) {
 				
-				final WorldServer worldTarget = DimensionManager.getWorld(celestialObjectChild.dimensionId);
+				WorldServer worldTarget = DimensionManager.getWorld(celestialObjectChild.dimensionId);
+				
+				if (worldTarget == null) {
+					try {
+						worldTarget = MinecraftServer.getServer().worldServerForDimension(celestialObjectChild.dimensionId);
+					} catch (Exception exception) {
+						WarpDrive.logger.error(String.format("%s: Failed to initialize dimension %d for %s",
+						                                     exception.getMessage(),
+						                                     celestialObjectChild.dimensionId,
+						                                     entityLivingBase));
+						if (WarpDrive.isDev) {
+							exception.printStackTrace();
+						}
+						worldTarget = null;
+					}
+				}
+				
 				if (worldTarget != null) {
 					final VectorI vEntry = celestialObjectChild.getEntryOffset();
 					final int xTarget = x + vEntry.x;