From d7817aef391737673be9fb7b27f5b1a3148327f9 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Thu, 21 Jun 2012 05:09:25 -0700
Subject: [PATCH] More bugfixes related to portal generation. Should be all
 now.

---
 .../net/minecraft/src/Teleporter.java.patch          | 12 ++++++++++++
 .../minecraft/net/minecraft/src/World.java.patch     |  9 +++++++++
 .../net/minecraft/src/Teleporter.java.patch          | 12 ++++++++++++
 .../net/minecraft/src/World.java.patch               |  9 +++++++++
 4 files changed, 42 insertions(+)

diff --git a/forge/patches/minecraft/net/minecraft/src/Teleporter.java.patch b/forge/patches/minecraft/net/minecraft/src/Teleporter.java.patch
index 792d00f9a..061c33b6c 100644
--- a/forge/patches/minecraft/net/minecraft/src/Teleporter.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/Teleporter.java.patch
@@ -27,3 +27,15 @@
                      {
                          if (par1World.isAirBlock(var14, var20, var17))
                          {
+@@ -304,9 +304,9 @@
+                 var10 = 70;
+             }
+ 
+-            if (var10 > 118)
++            if (var10 > par1World.getHeight() - 10) //BugFix
+             {
+-                var10 = 118;
++                var10 = par1World.getHeight() - 10; //BugFix
+             }
+ 
+             var16 = var10;
diff --git a/forge/patches/minecraft/net/minecraft/src/World.java.patch b/forge/patches/minecraft/net/minecraft/src/World.java.patch
index 81e3ebcc2..c3ea534a0 100644
--- a/forge/patches/minecraft/net/minecraft/src/World.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/World.java.patch
@@ -318,6 +318,15 @@
              return par1 > 0 && var8 == null && var9.canPlaceBlockOnSide(this, par2, par3, par4, par6);
          }
      }
+@@ -4399,7 +4413,7 @@
+      */
+     public int getHeight()
+     {
+-        return 256;
++        return worldProvider.hasNoSky ? 128 : 256; //Nether is 128, overworld is 256, Bugfix related to Portal generation
+     }
+ 
+     /**
 @@ -4449,4 +4463,39 @@
      {
          return this.worldInfo.getTerrainType().getHorizon(this);
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Teleporter.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Teleporter.java.patch
index a31d0d71d..9d417f875 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/Teleporter.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/Teleporter.java.patch
@@ -27,3 +27,15 @@
                      {
                          if (par1World.isAirBlock(var14, var20, var17))
                          {
+@@ -304,9 +304,9 @@
+                 var10 = 70;
+             }
+ 
+-            if (var10 > 118)
++            if (var10 > par1World.getHeight() - 10) //BugFix
+             {
+-                var10 = 118;
++                var10 = par1World.getHeight() - 10; //BugFix
+             }
+ 
+             var16 = var10;
diff --git a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch
index ae81b7b70..f631767fd 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch
@@ -283,6 +283,15 @@
  
              return par1 > 0 && var8 == null && var9.canPlaceBlockOnSide(this, par2, par3, par4, par6);
          }
+@@ -3827,7 +3838,7 @@
+      */
+     public int getHeight()
+     {
+-        return 256;
++        return worldProvider.hasNoSky ? 128 : 256; //Nether is 128, overworld is 256, Bugfix related to Portal generation
+     }
+ 
+     /**
 @@ -3864,4 +3875,38 @@
      {
          return this.getChunkProvider().findClosestStructure(this, par1Str, par2, par3, par4);