diff --git a/Spigot-Server-Patches/0176-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0176-Auto-fix-bad-Y-levels-on-player-login.patch
new file mode 100644
index 0000000000..81530fa9f8
--- /dev/null
+++ b/Spigot-Server-Patches/0176-Auto-fix-bad-Y-levels-on-player-login.patch
@@ -0,0 +1,22 @@
+From 6b3da1efe41b0866848a471f85b31481ec0e55fc Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Wed, 21 Sep 2016 23:48:39 -0400
+Subject: [PATCH] Auto fix bad Y levels on player login
+
+Bring down to a saner Y level if super high, as this can cause the server to crash
+
+diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
+index ec3a60a..5db0051 100644
+--- a/src/main/java/net/minecraft/server/EntityPlayer.java
++++ b/src/main/java/net/minecraft/server/EntityPlayer.java
+@@ -126,6 +126,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+             }
+         }
+ 
++        if (this.locY > 300) this.locY = 200; // Paper - bring down to a saner Y level if out of world
+         this.getBukkitEntity().readExtraData(nbttagcompound); // CraftBukkit
+     }
+ 
+-- 
+2.9.3
+