Merge upstream changes and rebuild patches

Bukkit

@@ -1 +1 @@
-Subproject commit db1761e3c9dd2a74cda188145a5d3dc9da57f712
+Subproject commit 67851e79b65efb980c2bd44a3560cff39540d370

CraftBukkit

@@ -1 +1 @@
-Subproject commit 8e5eab26554f734da63ff4deb13068a69873e949
+Subproject commit 95548945533d8572a7cb911b33c8ef4a823be49b

Spigot

@@ -1 +1 @@
-Subproject commit 90839e6224403fb7f32e6eeba704623a3121d541
+Subproject commit 5d4e372f482b9291a1255c62a6b02c754b66d5f8

Spigot-Server-Patches/Configurable-cactus-and-reed-natural-growth-heights.patch

@@ -34,7 +34,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            if (i < world.paperConfig.cactusMaxHeight) { // Paper - Configurable growth height
                  int j = ((Integer) iblockdata.get(BlockCactus.AGE)).intValue();
  
-                 if (j >= (byte) range(3, ((100 / world.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot
+                 if (j >= (byte) range(3, ((100.0F / world.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/BlockReed.java
@@ -47,5 +47,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                if (i < world.paperConfig.reedMaxHeight) { // Paper - Configurable growth height
                      int j = ((Integer) iblockdata.get(BlockReed.AGE)).intValue();
  
-                     if (j >= (byte) range(3, ((100 / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot
+                     if (j >= (byte) range(3, ((100.0F / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot
 --

Spigot-Server-Patches/Optimized-Light-Level-Comparisons.patch

@@ -72,8 +72,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public void b(World world, BlockPosition blockposition, IBlockData iblockdata, Random random) {
          if (!world.isClientSide) {
              super.b(world, blockposition, iblockdata, random);
--            if (world.getLightLevel(blockposition.up()) >= 9 && random.nextInt(Math.max(2, (int) (((100 / world.spigotConfig.saplingModifier) * 7) + 0.5F))) == 0) { // Spigot
-+            if (world.isLightLevel(blockposition.up(), 9) && random.nextInt(Math.max(2, (int) (((100 / world.spigotConfig.saplingModifier) * 7) + 0.5F))) == 0) { // Spigot // Paper
+-            if (world.getLightLevel(blockposition.up()) >= 9 && random.nextInt(Math.max(2, (int) (((100.0F / world.spigotConfig.saplingModifier) * 7) + 0.5F))) == 0) { // Spigot
++            if (world.isLightLevel(blockposition.up(), 9) && random.nextInt(Math.max(2, (int) (((100.0F / world.spigotConfig.saplingModifier) * 7) + 0.5F))) == 0) { // Spigot // Paper
                  // CraftBukkit start
                  world.captureTreeGeneration = true;
                  // CraftBukkit end
@@ -89,7 +89,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        if (world.isLightLevel(blockposition.up(), 9)) { // Paper
              float f = BlockCrops.a((Block) this, world, blockposition);
  
-             if (random.nextInt((int) ((100 / (this == Blocks.PUMPKIN_STEM ? world.spigotConfig.pumpkinModifier : world.spigotConfig.melonModifier)) * (25.0F / f)) + 1) == 0) { // Spigot
+             if (random.nextInt((int) ((100.0F / (this == Blocks.PUMPKIN_STEM ? world.spigotConfig.pumpkinModifier : world.spigotConfig.melonModifier)) * (25.0F / f)) + 1) == 0) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/EntityMonster.java