From 36c7a35db91430be3941e95b2129a1d6d1d97cc0 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Mon, 16 Apr 2012 15:17:21 -0700
Subject: [PATCH] Fix for vanilla crash for chunk generation with block ID's
 above 127.

---
 .../net/minecraft/src/Chunk.java.patch        | 33 ++++++++++++-------
 .../net/minecraft/src/Chunk.java.patch        | 29 +++++++++++-----
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch
index 866c6fc18..4891253e0 100644
--- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch
+++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch
@@ -9,7 +9,18 @@
  public class Chunk
  {
      /**
-@@ -585,7 +587,7 @@
+@@ -120,7 +122,9 @@
+             {
+                 for (int var8 = 0; var8 < var5; ++var8)
+                 {
+-                    byte var9 = par2ArrayOfByte[var6 << 11 | var7 << 7 | var8];
++                    /* FORGE: The following change, a cast from unsigned byte to int,
++                     * fixes a vanilla bug when generating new chunks that contain a block ID > 127 */
++                    int var9 = par2ArrayOfByte[var6 << 11 | var7 << 7 | var8] & 0xFF;
+ 
+                     if (var9 != 0)
+                     {
+@@ -585,7 +589,7 @@
                  {
                      Block.blocksList[var8].onBlockRemoval(this.worldObj, var11, par2, var12);
                  }
@@ -18,7 +29,7 @@
                  {
                      this.worldObj.removeBlockTileEntity(var11, par2, var12);
                  }
-@@ -629,32 +631,23 @@
+@@ -629,32 +633,23 @@
                          Block.blocksList[par4].onBlockAdded(this.worldObj, var11, par2, var12);
                      }
  
@@ -54,7 +65,7 @@
                  this.isModified = true;
                  return true;
              }
-@@ -686,7 +679,7 @@
+@@ -686,7 +681,7 @@
                  var5.setExtBlockMetadata(par1, par2 & 15, par3, par4);
                  int var7 = var5.getExtBlockID(par1, par2 & 15, par3);
  
@@ -63,7 +74,7 @@
                  {
                      TileEntity var8 = this.getChunkBlockTileEntity(par1, par2, par3);
  
-@@ -852,34 +845,33 @@
+@@ -852,34 +847,33 @@
      {
          ChunkPosition var4 = new ChunkPosition(par1, par2, par3);
          TileEntity var5 = (TileEntity)this.chunkTileEntityMap.get(var4);
@@ -109,7 +120,7 @@
      }
  
      /**
-@@ -894,7 +886,7 @@
+@@ -894,7 +888,7 @@
  
          if (this.isChunkLoaded)
          {
@@ -118,7 +129,7 @@
          }
      }
  
-@@ -909,8 +901,14 @@
+@@ -909,8 +903,14 @@
          par4TileEntity.yCoord = par2;
          par4TileEntity.zCoord = this.zPosition * 16 + par3;
  
@@ -134,7 +145,7 @@
              par4TileEntity.validate();
              this.chunkTileEntityMap.put(var5, par4TileEntity);
          }
-@@ -946,6 +944,7 @@
+@@ -946,6 +946,7 @@
          {
              this.worldObj.addLoadedEntities(this.entityLists[var1]);
          }
@@ -142,7 +153,7 @@
      }
  
      /**
-@@ -966,6 +965,7 @@
+@@ -966,6 +967,7 @@
          {
              this.worldObj.unloadEntities(this.entityLists[var3]);
          }
@@ -150,7 +161,7 @@
      }
  
      /**
-@@ -1228,6 +1228,16 @@
+@@ -1228,6 +1230,16 @@
  
      public void func_48494_a(byte[] par1ArrayOfByte, int par2, int par3, boolean par4)
      {
@@ -167,7 +178,7 @@
          int var5 = 0;
          int var6;
  
-@@ -1324,12 +1334,26 @@
+@@ -1324,12 +1336,26 @@
          }
  
          this.generateHeightMap();
@@ -199,7 +210,7 @@
          }
      }
  
-@@ -1435,4 +1459,18 @@
+@@ -1435,4 +1461,18 @@
              }
          }
      }
diff --git a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch
index 22875b33e..d99b0175e 100644
--- a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch
+++ b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch
@@ -9,7 +9,18 @@
  public class Chunk
  {
      /**
-@@ -545,7 +547,7 @@
+@@ -120,7 +122,9 @@
+             {
+                 for (int var8 = 0; var8 < var5; ++var8)
+                 {
+-                    byte var9 = par2ArrayOfByte[var6 << 11 | var7 << 7 | var8];
++                    /* FORGE: The following change, a cast from unsigned byte to int,
++                     * fixes a vanilla bug when generating new chunks that contain a block ID > 127 */
++                    int var9 = par2ArrayOfByte[var6 << 11 | var7 << 7 | var8] & 0xFF;
+ 
+                     if (var9 != 0)
+                     {
+@@ -545,7 +549,7 @@
                  {
                      Block.blocksList[var8].onBlockRemoval(this.worldObj, var11, par2, var12);
                  }
@@ -18,7 +29,7 @@
                  {
                      this.worldObj.removeBlockTileEntity(var11, par2, var12);
                  }
-@@ -589,32 +591,23 @@
+@@ -589,32 +593,23 @@
                          Block.blocksList[par4].onBlockAdded(this.worldObj, var11, par2, var12);
                      }
  
@@ -54,7 +65,7 @@
                  this.isModified = true;
                  return true;
              }
-@@ -646,7 +639,7 @@
+@@ -646,7 +641,7 @@
                  var5.setExtBlockMetadata(par1, par2 & 15, par3, par4);
                  int var7 = var5.getExtBlockID(par1, par2 & 15, par3);
  
@@ -63,7 +74,7 @@
                  {
                      TileEntity var8 = this.getChunkBlockTileEntity(par1, par2, par3);
  
-@@ -812,34 +805,31 @@
+@@ -812,34 +807,31 @@
      {
          ChunkPosition var4 = new ChunkPosition(par1, par2, par3);
          TileEntity var5 = (TileEntity)this.chunkTileEntityMap.get(var4);
@@ -108,7 +119,7 @@
      }
  
      /**
-@@ -854,7 +844,7 @@
+@@ -854,7 +846,7 @@
  
          if (this.isChunkLoaded)
          {
@@ -117,7 +128,7 @@
          }
      }
  
-@@ -869,8 +859,14 @@
+@@ -869,8 +861,14 @@
          par4TileEntity.yCoord = par2;
          par4TileEntity.zCoord = this.zPosition * 16 + par3;
  
@@ -133,7 +144,7 @@
              par4TileEntity.validate();
              this.chunkTileEntityMap.put(var5, par4TileEntity);
          }
-@@ -906,6 +902,7 @@
+@@ -906,6 +904,7 @@
          {
              this.worldObj.addLoadedEntities(this.entityLists[var1]);
          }
@@ -141,7 +152,7 @@
      }
  
      /**
-@@ -926,6 +923,7 @@
+@@ -926,6 +925,7 @@
          {
              this.worldObj.unloadEntities(this.entityLists[var3]);
          }
@@ -149,7 +160,7 @@
      }
  
      /**
-@@ -1287,4 +1285,18 @@
+@@ -1287,4 +1287,18 @@
              }
          }
      }