diff --git a/Spigot-Server-Patches/Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/Fix-Dragon-Server-Crashes.patch
new file mode 100644
index 0000000000..812b893070
--- /dev/null
+++ b/Spigot-Server-Patches/Fix-Dragon-Server-Crashes.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Wed, 21 Mar 2018 20:52:07 -0400
+Subject: [PATCH] Fix Dragon Server Crashes
+
+If the dragon tries to find "ground" and hits a hole, or off edge,
+it will infinitely keep looking for non air and eventually crash.
+
+diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
+index 054a7ef6c..deee5c4cc 100644
+--- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
++++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
+@@ -0,0 +0,0 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
+             double d2 = this.a.bw.locY + (double) (this.a.bw.length / 2.0F);
+             BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition(MathHelper.floor(d0), MathHelper.floor(d2), MathHelper.floor(d1));
+ 
+-            while (this.a.world.isEmpty(blockposition_mutableblockposition)) {
++            while (this.a.world.isEmpty(blockposition_mutableblockposition) && d2 > 0) { // Paper
+                 --d2;
+                 blockposition_mutableblockposition.c(MathHelper.floor(d0), MathHelper.floor(d2), MathHelper.floor(d1));
+             }
+--
\ No newline at end of file
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh
index c348742e7a..d97288abf9 100755
--- a/scripts/importmcdev.sh
+++ b/scripts/importmcdev.sh
@@ -63,6 +63,7 @@ import DataConverterMaterialId
 import DataInspectorBlockEntity
 import DataPalette
 import DefinedStructure
+import DragonControllerLandedFlame
 import EnchantmentManager
 import Enchantments
 import EntityLlama