Maybe I should start usingan IDE...

patches/net/minecraft/world/World.java.patch

@@ -932,7 +932,7 @@
 +            for(Object tile : loadedTileEntityList)
 +            {
 +                boolean marker = false;
-+                try { marker = !((TileEntity)tile).isGC(); } catch (Exception e) { try { marker = this.field_14783_b.contains(tile) } catch (Exception ex) { marker = false; } }
++                try { marker = !((TileEntity)tile).isGC(); } catch (Exception e) { try { marker = this.field_147483_b.contains(tile); } catch (Exception ex) { marker = false; } }
 +                if (marker) { temporary_tile_entity_list.add(tile); }
 +            }
 +            this.loadedTileEntityList = temporary_tile_entity_list;

patches/net/minecraft/world/gen/feature/WorldGenIceSpike.java.patch

@@ -5,7 +5,7 @@
                              if (block.getMaterial() == Material.air || block == Blocks.dirt || block == Blocks.snow || block == Blocks.ice)
                              {
 -                                this.func_150515_a(p_76484_1_, p_76484_3_ + l1, p_76484_4_ + j1, p_76484_5_ + i2, Blocks.packed_ice);
-+                                this.func_147449_b(p_76484_3_ + l1, p_76484_4_ + j1, p_76484_5_ + i2, Blocks.packed_ice); // Spigot
++                                p_76484_1_.setBlock(p_76484_3_ + l1, p_76484_4_ + j1, p_76484_5_ + i2, Blocks.packed_ice); // Spigot
                              }
  
                              if (j1 != 0 && k1 > 1)
@@ -14,7 +14,7 @@
                                  if (block.getMaterial() == Material.air || block == Blocks.dirt || block == Blocks.snow || block == Blocks.ice)
                                  {
 -                                    this.func_150515_a(p_76484_1_, p_76484_3_ + l1, p_76484_4_ - j1, p_76484_5_ + i2, Blocks.packed_ice);
-+                                    this.func_147449_b(p_76484_3_ + l1, p_76484_4_ - j1, p_76484_5_ + i2, Blocks.packed_ice); // Spigot
++                                    p_76484_1_.setBlock(p_76484_3_ + l1, p_76484_4_ - j1, p_76484_5_ + i2, Blocks.packed_ice); // Spigot
                                  }
                              }
                          }
@@ -23,7 +23,7 @@
                              if (block1.getMaterial() == Material.air || block1 == Blocks.dirt || block1 == Blocks.snow || block1 == Blocks.ice || block1 == Blocks.packed_ice)
                              {
 -                                this.func_150515_a(p_76484_1_, p_76484_3_ + j2, l1, p_76484_5_ + k1, Blocks.packed_ice);
-+                                this.func_147449_b(p_76484_3_ + j2, l1, p_76484_5_ + k1, Blocks.packed_ice); // Spigot
++                                p_76484_1_.setBlock(p_76484_3_ + j2, l1, p_76484_5_ + k1, Blocks.packed_ice); // Spigot
                                  --l1;
                                  --k2;