diff --git a/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch
index a468c751ea..5a7e84a439 100644
--- a/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch
+++ b/CraftBukkit-Patches/0007-Crop-Growth-Rates.patch
@@ -36,7 +36,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
 -                if (j == 15) {
 +                if (j >= (byte) range(3, (world.growthOdds / world.spigotConfig.cactusModifier * 15) + 0.5F, 15)) { // Spigot
-                     world.setTypeUpdate(blockposition1, this.getBlockData());
+                     // world.setTypeUpdate(blockposition1, this.getBlockData()); // CraftBukkit
                      IBlockData iblockdata1 = iblockdata.set(BlockCactus.AGE, Integer.valueOf(0));
  
 diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java
@@ -103,8 +103,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                    if (j == 15) {
 +                    if (j >= (byte) range(3, (world.growthOdds / world.spigotConfig.caneModifier * 15) + 0.5F, 15)) { // Spigot
                          // CraftBukkit start
-                         // world.setTypeUpdate(blockposition.up(), this.getBlockData());
-                         // world.setTypeAndData(blockposition, iblockdata.set(BlockReed.AGE, Integer.valueOf(0)), 4);
+                         // world.setTypeUpdate(blockposition.up(), this.getBlockData()); // CraftBukkit
+                         BlockPosition upPos = blockposition.up();
 diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/BlockSapling.java
diff --git a/CraftBukkit-Patches/0012-Spigot-Timings.patch b/CraftBukkit-Patches/0012-Spigot-Timings.patch
index 12d3de7e82..b87bcff569 100644
--- a/CraftBukkit-Patches/0012-Spigot-Timings.patch
+++ b/CraftBukkit-Patches/0012-Spigot-Timings.patch
@@ -441,7 +441,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          return this.world;
      }
 @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
-         this.M = worldprovider.getWorldBorder();
+         this.M.a(new WorldBorderListener(((WorldServer) this).getServer().getHandle())); // CraftBukkit
  
          this.getServer().addWorld(this.world); // CraftBukkit
 +        timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings
diff --git a/CraftBukkit-Patches/0061-Particle-API.patch b/CraftBukkit-Patches/0061-Particle-API.patch
index 9ec5462df9..bc8f5e430b 100644
--- a/CraftBukkit-Patches/0061-Particle-API.patch
+++ b/CraftBukkit-Patches/0061-Particle-API.patch
@@ -91,7 +91,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                                extra = new int[]{ id };
 +                            } else 
 +                            {
-+                                extra = new int[]{ (id << 4) | data };                                
++                                extra = new int[]{ (data << 12) | (id & 0xFFF) };
 +                            }
 +                        }
 +                        break;
@@ -167,7 +167,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                                extra = new int[]{ id };
 +                            } else 
 +                            {
-+                                extra = new int[]{ (id << 4) | data };                                
++                                extra = new int[]{ (data << 12) | (id & 0xFFF) };
 +                            }
 +                        }
 +                        break;