diff --git a/forge/patches/minecraft/net/minecraft/src/Teleporter.java.patch b/forge/patches/minecraft/net/minecraft/src/Teleporter.java.patch
new file mode 100644
index 000000000..792d00f9a
--- /dev/null
+++ b/forge/patches/minecraft/net/minecraft/src/Teleporter.java.patch
@@ -0,0 +1,29 @@
+--- ../src_base/minecraft/net/minecraft/src/Teleporter.java	0000-00-00 00:00:00.000000000 -0000
++++ ../src_work/minecraft/net/minecraft/src/Teleporter.java	0000-00-00 00:00:00.000000000 -0000
+@@ -70,7 +70,7 @@
+             {
+                 double var15 = (double)var14 + 0.5D - par2Entity.posZ;
+ 
+-                for (int var17 = 127; var17 >= 0; --var17)
++                for (int var17 = par1World.getHeight() - 1; var17 >= 0; --var17) //BugFix
+                 {
+                     if (par1World.getBlockId(var11, var17, var14) == Block.portal.blockID)
+                     {
+@@ -170,7 +170,7 @@
+                 var18 = (double)var17 + 0.5D - par2Entity.posZ;
+                 label274:
+ 
+-                for (var20 = 127; var20 >= 0; --var20)
++                for (var20 = par1World.getHeight() - 1; var20 >= 0; --var20) //BugFix
+                 {
+                     if (par1World.isAirBlock(var14, var20, var17))
+                     {
+@@ -236,7 +236,7 @@
+                     var18 = (double)var17 + 0.5D - par2Entity.posZ;
+                     label222:
+ 
+-                    for (var20 = 127; var20 >= 0; --var20)
++                    for (var20 = par1World.getHeight() - 1; var20 >= 0; --var20) //BugFix
+                     {
+                         if (par1World.isAirBlock(var14, var20, var17))
+                         {
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Teleporter.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Teleporter.java.patch
new file mode 100644
index 000000000..a31d0d71d
--- /dev/null
+++ b/forge/patches/minecraft_server/net/minecraft/src/Teleporter.java.patch
@@ -0,0 +1,29 @@
+--- ../src_base/minecraft_server/net/minecraft/src/Teleporter.java	0000-00-00 00:00:00.000000000 -0000
++++ ../src_work/minecraft_server/net/minecraft/src/Teleporter.java	0000-00-00 00:00:00.000000000 -0000
+@@ -70,7 +70,7 @@
+             {
+                 double var15 = (double)var14 + 0.5D - par2Entity.posZ;
+ 
+-                for (int var17 = 127; var17 >= 0; --var17)
++                for (int var17 = par1World.getHeight() - 1; var17 >= 0; --var17) //BugFix
+                 {
+                     if (par1World.getBlockId(var11, var17, var14) == Block.portal.blockID)
+                     {
+@@ -170,7 +170,7 @@
+                 var18 = (double)var17 + 0.5D - par2Entity.posZ;
+                 label274:
+ 
+-                for (var20 = 127; var20 >= 0; --var20)
++                for (var20 = par1World.getHeight() - 1; var20 >= 0; --var20) //BugFix
+                 {
+                     if (par1World.isAirBlock(var14, var20, var17))
+                     {
+@@ -236,7 +236,7 @@
+                     var18 = (double)var17 + 0.5D - par2Entity.posZ;
+                     label222:
+ 
+-                    for (var20 = 127; var20 >= 0; --var20)
++                    for (var20 = par1World.getHeight() - 1; var20 >= 0; --var20) //BugFix
+                     {
+                         if (par1World.isAirBlock(var14, var20, var17))
+                         {