From 89741d3e9ff89cb2aa3b2e34a714a3a073b60d95 Mon Sep 17 00:00:00 2001 From: DerFrZocker Date: Thu, 20 Oct 2022 07:31:42 +1100 Subject: [PATCH] SPIGOT-7159: Crop Growth Modifier resolution is severely low --- .../0004-Crop-Growth-Rates.patch | 106 +++++++++++++----- .../0005-Merge-tweaks-and-configuration.patch | 14 +-- CraftBukkit-Patches/0007-View-Distance.patch | 6 +- CraftBukkit-Patches/0008-Spigot-Timings.patch | 20 ++-- ...b-Spawning-Relative-to-View-Distance.patch | 6 +- .../0011-Item-Despawn-Rate.patch | 6 +- .../0012-Entity-Activation-Range.patch | 12 +- .../0014-Entity-Tracking-Ranges.patch | 6 +- .../0016-Hopper-Customisations.patch | 6 +- .../0027-Arrow-Despawn-Rate.patch | 6 +- ...Disabling-Zombie-Villager-Aggression.patch | 6 +- ...dd-Option-to-Nerf-Mobs-from-Spawners.patch | 6 +- ...f-ZombiePigmen-spawning-in-portal-bl.patch | 6 +- ...dragon-death-and-wither-spawn-sounds.patch | 6 +- .../0064-Further-Seed-Customisation.patch | 8 +- .../0075-Add-Hunger-Config-Values.patch | 6 +- .../0077-Limit-TNT-Detonations-per-tick.patch | 6 +- .../0078-Configurable-Hanging-Tick.patch | 6 +- ...-Allow-Capping-Tile-Entity-Tick-Time.patch | 6 +- .../0083-Implement-SpawnerSpawnEvent.patch | 8 +- .../0088-Add-log-villager-deaths-option.patch | 6 +- .../0090-Configurable-Thunder-Chance.patch | 8 +- ...1-Configurable-Below-Zero-Generation.patch | 6 +- 23 files changed, 158 insertions(+), 114 deletions(-) diff --git a/CraftBukkit-Patches/0004-Crop-Growth-Rates.patch b/CraftBukkit-Patches/0004-Crop-Growth-Rates.patch index bfb6c4e5..406dbd7c 100644 --- a/CraftBukkit-Patches/0004-Crop-Growth-Rates.patch +++ b/CraftBukkit-Patches/0004-Crop-Growth-Rates.patch @@ -1,4 +1,4 @@ -From f431952026216cdf25e82043ad53e5d7deee472b Mon Sep 17 00:00:00 2001 +From e0224e893a0a7ada1bbb1486c98a9b7825b51b5a Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 7 Mar 2016 22:14:13 +1100 Subject: [PATCH] Crop Growth Rates @@ -29,7 +29,7 @@ index b32b2faf4..58715c8c0 100644 private final IBlockData first; diff --git a/src/main/java/net/minecraft/world/level/block/BlockBamboo.java b/src/main/java/net/minecraft/world/level/block/BlockBamboo.java -index 7f9a098a2..812658df3 100644 +index 7f9a098a2..508d0a6a8 100644 --- a/src/main/java/net/minecraft/world/level/block/BlockBamboo.java +++ b/src/main/java/net/minecraft/world/level/block/BlockBamboo.java @@ -127,7 +127,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement { @@ -37,25 +37,46 @@ index 7f9a098a2..812658df3 100644 public void randomTick(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, RandomSource randomsource) { if ((Integer) iblockdata.getValue(BlockBamboo.STAGE) == 0) { - if (randomsource.nextInt(3) == 0 && worldserver.isEmptyBlock(blockposition.above()) && worldserver.getRawBrightness(blockposition.above(), 0) >= 9) { -+ if (randomsource.nextInt(Math.max(1, (int) (100.0F / worldserver.spigotConfig.bambooModifier) * 3)) == 0 && worldserver.isEmptyBlock(blockposition.above()) && worldserver.getRawBrightness(blockposition.above(), 0) >= 9) { // Spigot ++ if (randomsource.nextFloat() < (worldserver.spigotConfig.bambooModifier / (100.0f * 3)) && worldserver.isEmptyBlock(blockposition.above()) && worldserver.getRawBrightness(blockposition.above(), 0) >= 9) { // Spigot - SPIGOT-7159: Better modifier resolution int i = this.getHeightBelowUpToMax(worldserver, blockposition) + 1; if (i < 16) { +diff --git a/src/main/java/net/minecraft/world/level/block/BlockBambooSapling.java b/src/main/java/net/minecraft/world/level/block/BlockBambooSapling.java +index c02d96eb2..ef9c3ef0c 100644 +--- a/src/main/java/net/minecraft/world/level/block/BlockBambooSapling.java ++++ b/src/main/java/net/minecraft/world/level/block/BlockBambooSapling.java +@@ -38,7 +38,7 @@ public class BlockBambooSapling extends Block implements IBlockFragilePlantEleme + + @Override + public void randomTick(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, RandomSource randomsource) { +- if (randomsource.nextInt(3) == 0 && worldserver.isEmptyBlock(blockposition.above()) && worldserver.getRawBrightness(blockposition.above(), 0) >= 9) { ++ if (randomsource.nextFloat() < (worldserver.spigotConfig.bambooModifier / (100.0f * 3)) && worldserver.isEmptyBlock(blockposition.above()) && worldserver.getRawBrightness(blockposition.above(), 0) >= 9) { // Spigot - SPIGOT-7159: Better modifier resolution + this.growBamboo(worldserver, blockposition); + } + diff --git a/src/main/java/net/minecraft/world/level/block/BlockCactus.java b/src/main/java/net/minecraft/world/level/block/BlockCactus.java -index 028780661..189594818 100644 +index 028780661..16d7e96e9 100644 --- a/src/main/java/net/minecraft/world/level/block/BlockCactus.java +++ b/src/main/java/net/minecraft/world/level/block/BlockCactus.java -@@ -59,7 +59,7 @@ public class BlockCactus extends Block { +@@ -59,13 +59,14 @@ public class BlockCactus extends Block { if (i < 3) { int j = (Integer) iblockdata.getValue(BlockCactus.AGE); - if (j == 15) { -+ if (j >= (byte) range(3, ((100.0F / worldserver.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot ++ int modifier = worldserver.spigotConfig.cactusModifier; // Spigot - SPIGOT-7159: Better modifier resolution ++ if (j >= 15 || (modifier != 100 && randomsource.nextFloat() < (modifier / (100.0f * 16)))) { // Spigot - SPIGOT-7159: Better modifier resolution CraftEventFactory.handleBlockGrowEvent(worldserver, blockposition1, this.defaultBlockState()); // CraftBukkit IBlockData iblockdata1 = (IBlockData) iblockdata.setValue(BlockCactus.AGE, 0); + worldserver.setBlock(blockposition, iblockdata1, 4); + worldserver.neighborChanged(iblockdata1, blockposition1, this, blockposition, false); +- } else { ++ } else if (modifier == 100 || randomsource.nextFloat() < (modifier / (100.0f * 16))) { // Spigot - SPIGOT-7159: Better modifier resolution + worldserver.setBlock(blockposition, (IBlockData) iblockdata.setValue(BlockCactus.AGE, j + 1), 4); + } + diff --git a/src/main/java/net/minecraft/world/level/block/BlockCocoa.java b/src/main/java/net/minecraft/world/level/block/BlockCocoa.java -index f7577aafb..94797e511 100644 +index f7577aafb..a1f03ab28 100644 --- a/src/main/java/net/minecraft/world/level/block/BlockCocoa.java +++ b/src/main/java/net/minecraft/world/level/block/BlockCocoa.java @@ -52,7 +52,7 @@ public class BlockCocoa extends BlockFacingHorizontal implements IBlockFragilePl @@ -63,12 +84,12 @@ index f7577aafb..94797e511 100644 @Override public void randomTick(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, RandomSource randomsource) { - if (worldserver.random.nextInt(5) == 0) { -+ if (worldserver.random.nextInt(Math.max(1, (int) (100.0F / worldserver.spigotConfig.cocoaModifier) * 5)) == 0) { // Spigot ++ if (worldserver.random.nextFloat() < (worldserver.spigotConfig.cocoaModifier / (100.0f * 5))) { // Spigot - SPIGOT-7159: Better modifier resolution int i = (Integer) iblockdata.getValue(BlockCocoa.AGE); if (i < 2) { diff --git a/src/main/java/net/minecraft/world/level/block/BlockCrops.java b/src/main/java/net/minecraft/world/level/block/BlockCrops.java -index 1792ae91d..34006916e 100644 +index 1792ae91d..0dfcba1ff 100644 --- a/src/main/java/net/minecraft/world/level/block/BlockCrops.java +++ b/src/main/java/net/minecraft/world/level/block/BlockCrops.java @@ -77,7 +77,20 @@ public class BlockCrops extends BlockPlant implements IBlockFragilePlantElement @@ -88,26 +109,38 @@ index 1792ae91d..34006916e 100644 + modifier = worldserver.spigotConfig.wheatModifier; + } + -+ if (randomsource.nextInt((int) ((100.0F / modifier) * (25.0F / f)) + 1) == 0) { ++ if (randomsource.nextFloat() < (modifier / (100.0f * (Math.floor((25.0F / f) + 1))))) { // Spigot - SPIGOT-7159: Better modifier resolution + // Spigot end CraftEventFactory.handleBlockGrowEvent(worldserver, blockposition, this.getStateForAge(i + 1), 2); // CraftBukkit } } diff --git a/src/main/java/net/minecraft/world/level/block/BlockGrowingTop.java b/src/main/java/net/minecraft/world/level/block/BlockGrowingTop.java -index c4bf2c852..97fce1f4c 100644 +index c4bf2c852..aadca82cc 100644 --- a/src/main/java/net/minecraft/world/level/block/BlockGrowingTop.java +++ b/src/main/java/net/minecraft/world/level/block/BlockGrowingTop.java -@@ -40,7 +40,7 @@ public abstract class BlockGrowingTop extends BlockGrowingAbstract implements IB +@@ -40,7 +40,19 @@ public abstract class BlockGrowingTop extends BlockGrowingAbstract implements IB @Override public void randomTick(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, RandomSource randomsource) { - if ((Integer) iblockdata.getValue(BlockGrowingTop.AGE) < 25 && randomsource.nextDouble() < this.growPerTickProbability) { -+ if ((Integer) iblockdata.getValue(BlockGrowingTop.AGE) < 25 && randomsource.nextDouble() < (100.0D / worldserver.spigotConfig.kelpModifier) * this.growPerTickProbability) { // Spigot ++ // Spigot start ++ int modifier; ++ if (this == Blocks.KELP) { ++ modifier = worldserver.spigotConfig.kelpModifier; ++ } else if (this == Blocks.TWISTING_VINES) { ++ modifier = worldserver.spigotConfig.twistingVinesModifier; ++ } else if (this == Blocks.WEEPING_VINES) { ++ modifier = worldserver.spigotConfig.weepingVinesModifier; ++ } else { ++ modifier = worldserver.spigotConfig.caveVinesModifier; ++ } ++ if ((Integer) iblockdata.getValue(BlockGrowingTop.AGE) < 25 && randomsource.nextDouble() < ((modifier / 100.0D) * this.growPerTickProbability)) { // Spigot - SPIGOT-7159: Better modifier resolution ++ // Spigot end BlockPosition blockposition1 = blockposition.relative(this.growthDirection); if (this.canGrowInto(worldserver.getBlockState(blockposition1))) { diff --git a/src/main/java/net/minecraft/world/level/block/BlockMushroom.java b/src/main/java/net/minecraft/world/level/block/BlockMushroom.java -index b8fd3b4da..c7650774f 100644 +index b8fd3b4da..fc01aa293 100644 --- a/src/main/java/net/minecraft/world/level/block/BlockMushroom.java +++ b/src/main/java/net/minecraft/world/level/block/BlockMushroom.java @@ -38,7 +38,7 @@ public class BlockMushroom extends BlockPlant implements IBlockFragilePlantEleme @@ -115,12 +148,12 @@ index b8fd3b4da..c7650774f 100644 @Override public void randomTick(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, RandomSource randomsource) { - if (randomsource.nextInt(25) == 0) { -+ if (randomsource.nextInt(Math.max(1, (int) (100.0F / worldserver.spigotConfig.mushroomModifier) * 25)) == 0) { // Spigot ++ if (randomsource.nextFloat() < (worldserver.spigotConfig.mushroomModifier / (100.0f * 25))) { // Spigot - SPIGOT-7159: Better modifier resolution int i = 5; boolean flag = true; Iterator iterator = BlockPosition.betweenClosed(blockposition.offset(-4, -1, -4), blockposition.offset(4, 1, 4)).iterator(); diff --git a/src/main/java/net/minecraft/world/level/block/BlockNetherWart.java b/src/main/java/net/minecraft/world/level/block/BlockNetherWart.java -index 4c98e09c2..888ad41b3 100644 +index 4c98e09c2..626d93a4d 100644 --- a/src/main/java/net/minecraft/world/level/block/BlockNetherWart.java +++ b/src/main/java/net/minecraft/world/level/block/BlockNetherWart.java @@ -44,7 +44,7 @@ public class BlockNetherWart extends BlockPlant { @@ -128,25 +161,30 @@ index 4c98e09c2..888ad41b3 100644 int i = (Integer) iblockdata.getValue(BlockNetherWart.AGE); - if (i < 3 && randomsource.nextInt(10) == 0) { -+ if (i < 3 && randomsource.nextInt(Math.max(1, (int) (100.0F / worldserver.spigotConfig.wartModifier) * 10)) == 0) { // Spigot ++ if (i < 3 && randomsource.nextFloat() < (worldserver.spigotConfig.wartModifier / (100.0f * 10))) { // Spigot - SPIGOT-7159: Better modifier resolution iblockdata = (IBlockData) iblockdata.setValue(BlockNetherWart.AGE, i + 1); org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(worldserver, blockposition, iblockdata, 2); // CraftBukkit } diff --git a/src/main/java/net/minecraft/world/level/block/BlockReed.java b/src/main/java/net/minecraft/world/level/block/BlockReed.java -index 442200504..adb54833e 100644 +index 442200504..5ffaeaac9 100644 --- a/src/main/java/net/minecraft/world/level/block/BlockReed.java +++ b/src/main/java/net/minecraft/world/level/block/BlockReed.java -@@ -55,7 +55,7 @@ public class BlockReed extends Block { +@@ -55,10 +55,11 @@ public class BlockReed extends Block { if (i < 3) { int j = (Integer) iblockdata.getValue(BlockReed.AGE); - if (j == 15) { -+ if (j >= (byte) range(3, ((100.0F / worldserver.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot ++ int modifier = worldserver.spigotConfig.caneModifier; // Spigot - SPIGOT-7159: Better modifier resolution ++ if (j >= 15 || (modifier != 100 && randomsource.nextFloat() < (modifier / (100.0f * 16)))) { // Spigot - SPIGOT-7159: Better modifier resolution org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(worldserver, blockposition.above(), this.defaultBlockState()); // CraftBukkit worldserver.setBlock(blockposition, (IBlockData) iblockdata.setValue(BlockReed.AGE, 0), 4); - } else { +- } else { ++ } else if (modifier == 100 || randomsource.nextFloat() < (modifier / (100.0f * 16))) { // Spigot - SPIGOT-7159: Better modifier resolution + worldserver.setBlock(blockposition, (IBlockData) iblockdata.setValue(BlockReed.AGE, j + 1), 4); + } + } diff --git a/src/main/java/net/minecraft/world/level/block/BlockSapling.java b/src/main/java/net/minecraft/world/level/block/BlockSapling.java -index 7e2042d4d..671873c16 100644 +index ca7214220..588cb04f4 100644 --- a/src/main/java/net/minecraft/world/level/block/BlockSapling.java +++ b/src/main/java/net/minecraft/world/level/block/BlockSapling.java @@ -42,7 +42,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen @@ -154,12 +192,12 @@ index 7e2042d4d..671873c16 100644 @Override public void randomTick(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, RandomSource randomsource) { - if (worldserver.getMaxLocalRawBrightness(blockposition.above()) >= 9 && randomsource.nextInt(7) == 0) { -+ if (worldserver.getMaxLocalRawBrightness(blockposition.above()) >= 9 && randomsource.nextInt(Math.max(2, (int) (((100.0F / worldserver.spigotConfig.saplingModifier) * 7) + 0.5F))) == 0) { // Spigot ++ if (worldserver.getMaxLocalRawBrightness(blockposition.above()) >= 9 && randomsource.nextFloat() < (worldserver.spigotConfig.saplingModifier / (100.0f * 7))) { // Spigot - SPIGOT-7159: Better modifier resolution this.advanceTree(worldserver, blockposition, iblockdata, randomsource); } diff --git a/src/main/java/net/minecraft/world/level/block/BlockStem.java b/src/main/java/net/minecraft/world/level/block/BlockStem.java -index e8a25e164..734384910 100644 +index e8a25e164..c7dbe8f74 100644 --- a/src/main/java/net/minecraft/world/level/block/BlockStem.java +++ b/src/main/java/net/minecraft/world/level/block/BlockStem.java @@ -53,7 +53,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement { @@ -167,12 +205,12 @@ index e8a25e164..734384910 100644 float f = BlockCrops.getGrowthSpeed(this, worldserver, blockposition); - if (randomsource.nextInt((int) (25.0F / f) + 1) == 0) { -+ if (randomsource.nextInt((int) ((100.0F / (this == Blocks.PUMPKIN_STEM ? worldserver.spigotConfig.pumpkinModifier : worldserver.spigotConfig.melonModifier)) * (25.0F / f)) + 1) == 0) { // Spigot ++ if (randomsource.nextFloat() < (this == Blocks.PUMPKIN_STEM ? worldserver.spigotConfig.pumpkinModifier : worldserver.spigotConfig.melonModifier / (100.0f * (Math.floor((25.0F / f) + 1))))) { // Spigot - SPIGOT-7159: Better modifier resolution int i = (Integer) iblockdata.getValue(BlockStem.AGE); if (i < 7) { diff --git a/src/main/java/net/minecraft/world/level/block/BlockSweetBerryBush.java b/src/main/java/net/minecraft/world/level/block/BlockSweetBerryBush.java -index 480110fb0..7bc09798b 100644 +index 41e0741f4..bd9583611 100644 --- a/src/main/java/net/minecraft/world/level/block/BlockSweetBerryBush.java +++ b/src/main/java/net/minecraft/world/level/block/BlockSweetBerryBush.java @@ -67,7 +67,7 @@ public class BlockSweetBerryBush extends BlockPlant implements IBlockFragilePlan @@ -180,12 +218,12 @@ index 480110fb0..7bc09798b 100644 int i = (Integer) iblockdata.getValue(BlockSweetBerryBush.AGE); - if (i < 3 && randomsource.nextInt(5) == 0 && worldserver.getRawBrightness(blockposition.above(), 0) >= 9) { -+ if (i < 3 && randomsource.nextInt(Math.max(1, (int) (100.0F / worldserver.spigotConfig.sweetBerryModifier) * 5)) == 0 && worldserver.getRawBrightness(blockposition.above(), 0) >= 9) { // Spigot ++ if (i < 3 && randomsource.nextFloat() < (worldserver.spigotConfig.sweetBerryModifier / (100.0f * 5)) && worldserver.getRawBrightness(blockposition.above(), 0) >= 9) { // Spigot - SPIGOT-7159: Better modifier resolution IBlockData iblockdata1 = (IBlockData) iblockdata.setValue(BlockSweetBerryBush.AGE, i + 1); if (!CraftEventFactory.handleBlockGrowEvent(worldserver, blockposition, iblockdata1, 2)) return; // CraftBukkit diff --git a/src/main/java/net/minecraft/world/level/block/BlockVine.java b/src/main/java/net/minecraft/world/level/block/BlockVine.java -index 488e8dc32..2b2557ae7 100644 +index 488e8dc32..62f58c7eb 100644 --- a/src/main/java/net/minecraft/world/level/block/BlockVine.java +++ b/src/main/java/net/minecraft/world/level/block/BlockVine.java @@ -177,7 +177,7 @@ public class BlockVine extends Block { @@ -193,15 +231,15 @@ index 488e8dc32..2b2557ae7 100644 @Override public void randomTick(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, RandomSource randomsource) { - if (randomsource.nextInt(4) == 0) { -+ if (randomsource.nextInt(Math.max(1, (int) (100.0F / worldserver.spigotConfig.vineModifier) * 4)) == 0) { // Spigot ++ if (randomsource.nextFloat() < (worldserver.spigotConfig.vineModifier / (100.0f * 4))) { // Spigot - SPIGOT-7159: Better modifier resolution EnumDirection enumdirection = EnumDirection.getRandom(randomsource); BlockPosition blockposition1 = blockposition.above(); BlockPosition blockposition2; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 1cce14866..fb9c4fc78 100644 +index 1cce14866..f42972427 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -79,4 +79,53 @@ public class SpigotWorldConfig +@@ -79,4 +79,59 @@ public class SpigotWorldConfig config.addDefault( "world-settings.default." + path, def ); return config.get( "world-settings." + worldName + "." + path, config.get( "world-settings.default." + path ) ); } @@ -223,6 +261,9 @@ index 1cce14866..fb9c4fc78 100644 + public int bambooModifier; + public int sweetBerryModifier; + public int kelpModifier; ++ public int twistingVinesModifier; ++ public int weepingVinesModifier; ++ public int caveVinesModifier; + private int getAndValidateGrowth(String crop) + { + int modifier = getInt( "growth." + crop.toLowerCase(java.util.Locale.ENGLISH) + "-modifier", 100 ); @@ -253,6 +294,9 @@ index 1cce14866..fb9c4fc78 100644 + bambooModifier = getAndValidateGrowth( "Bamboo" ); + sweetBerryModifier = getAndValidateGrowth( "SweetBerry" ); + kelpModifier = getAndValidateGrowth( "Kelp" ); ++ twistingVinesModifier = getAndValidateGrowth( "TwistingVines" ); ++ weepingVinesModifier = getAndValidateGrowth( "WeepingVines" ); ++ caveVinesModifier = getAndValidateGrowth( "CaveVines" ); + } } -- diff --git a/CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch index 267bf143..15494336 100644 --- a/CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch +++ b/CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch @@ -1,4 +1,4 @@ -From 32efb579e202fcb2b1f08319065080e1a3121a3f Mon Sep 17 00:00:00 2001 +From 89e3fe51125fda23be60872c96b5a3a398ce9878 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:46:33 +1100 Subject: [PATCH] Merge tweaks and configuration @@ -31,10 +31,10 @@ index 5a0f63036..70c74e9c4 100644 } else { merge(entityitem, itemstack1, this, itemstack); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 247efa216..87a876b2d 100644 +index ca98ddf7d..8aabc1ae1 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -626,6 +626,23 @@ public class CraftEventFactory { +@@ -631,6 +631,23 @@ public class CraftEventFactory { return true; } event = CraftEventFactory.callLightningStrikeEvent((LightningStrike) entity.getBukkitEntity(), cause); @@ -59,12 +59,12 @@ index 247efa216..87a876b2d 100644 event = CraftEventFactory.callEntitySpawnEvent(entity); } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index fb9c4fc78..8c855cf9b 100644 +index f42972427..5ff085b9e 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -128,4 +128,18 @@ public class SpigotWorldConfig - sweetBerryModifier = getAndValidateGrowth( "SweetBerry" ); - kelpModifier = getAndValidateGrowth( "Kelp" ); +@@ -134,4 +134,18 @@ public class SpigotWorldConfig + weepingVinesModifier = getAndValidateGrowth( "WeepingVines" ); + caveVinesModifier = getAndValidateGrowth( "CaveVines" ); } + + public double itemMerge; diff --git a/CraftBukkit-Patches/0007-View-Distance.patch b/CraftBukkit-Patches/0007-View-Distance.patch index 4cc56207..689b51f8 100644 --- a/CraftBukkit-Patches/0007-View-Distance.patch +++ b/CraftBukkit-Patches/0007-View-Distance.patch @@ -1,4 +1,4 @@ -From e7d3e68fde46651fee70c20f2f0a214955f298a5 Mon Sep 17 00:00:00 2001 +From 26a6a68d82ee015ed0ce6aa3cac3875960abefec Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:52:41 +1100 Subject: [PATCH] View Distance @@ -67,10 +67,10 @@ index 9c10bee1d..6912ece1e 100644 private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot() { diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 8c855cf9b..e5df553a9 100644 +index 5ff085b9e..acaf90301 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -142,4 +142,36 @@ public class SpigotWorldConfig +@@ -148,4 +148,36 @@ public class SpigotWorldConfig expMerge = getDouble("merge-radius.exp", 3.0 ); log( "Experience Merge Radius: " + expMerge ); } diff --git a/CraftBukkit-Patches/0008-Spigot-Timings.patch b/CraftBukkit-Patches/0008-Spigot-Timings.patch index c00a4b42..b3faecd9 100644 --- a/CraftBukkit-Patches/0008-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0008-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From 3bd29c8912fb7c9792a77549e7953392bd94fad4 Mon Sep 17 00:00:00 2001 +From 6f45efe6e439769b06ac58d18fb9a9cd39898a47 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -359,7 +359,7 @@ index 8e856aacd..3ad91a6b4 100644 protected boolean isHorizontalCollisionMinor(Vec3D vec3d) { diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java -index ede58af96..c3b69f38e 100644 +index ea9ed2cf0..08dba14a4 100644 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java @@ -142,6 +142,8 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -371,7 +371,7 @@ index ede58af96..c3b69f38e 100644 public abstract class EntityLiving extends Entity { private static final Logger LOGGER = LogUtils.getLogger(); -@@ -2809,6 +2811,7 @@ public abstract class EntityLiving extends Entity { +@@ -2812,6 +2814,7 @@ public abstract class EntityLiving extends Entity { @Override public void tick() { @@ -379,7 +379,7 @@ index ede58af96..c3b69f38e 100644 super.tick(); this.updatingUsingItem(); this.updateSwimAmount(); -@@ -2850,7 +2853,9 @@ public abstract class EntityLiving extends Entity { +@@ -2853,7 +2856,9 @@ public abstract class EntityLiving extends Entity { } if (!this.isRemoved()) { @@ -389,7 +389,7 @@ index ede58af96..c3b69f38e 100644 } double d0 = this.getX() - this.xo; -@@ -2933,6 +2938,7 @@ public abstract class EntityLiving extends Entity { +@@ -2936,6 +2941,7 @@ public abstract class EntityLiving extends Entity { this.setXRot(0.0F); } @@ -397,7 +397,7 @@ index ede58af96..c3b69f38e 100644 } public void detectEquipmentUpdates() { -@@ -3114,6 +3120,7 @@ public abstract class EntityLiving extends Entity { +@@ -3117,6 +3123,7 @@ public abstract class EntityLiving extends Entity { this.setDeltaMovement(d4, d5, d6); this.level.getProfiler().push("ai"); @@ -405,7 +405,7 @@ index ede58af96..c3b69f38e 100644 if (this.isImmobile()) { this.jumping = false; this.xxa = 0.0F; -@@ -3123,6 +3130,7 @@ public abstract class EntityLiving extends Entity { +@@ -3126,6 +3133,7 @@ public abstract class EntityLiving extends Entity { this.serverAiStep(); this.level.getProfiler().pop(); } @@ -413,7 +413,7 @@ index ede58af96..c3b69f38e 100644 this.level.getProfiler().pop(); this.level.getProfiler().push("jump"); -@@ -3157,7 +3165,9 @@ public abstract class EntityLiving extends Entity { +@@ -3160,7 +3168,9 @@ public abstract class EntityLiving extends Entity { this.updateFallFlying(); AxisAlignedBB axisalignedbb = this.getBoundingBox(); @@ -423,7 +423,7 @@ index ede58af96..c3b69f38e 100644 this.level.getProfiler().pop(); this.level.getProfiler().push("freezing"); boolean flag1 = this.getType().is(TagsEntity.FREEZE_HURTS_EXTRA_TYPES); -@@ -3186,7 +3196,9 @@ public abstract class EntityLiving extends Entity { +@@ -3189,7 +3199,9 @@ public abstract class EntityLiving extends Entity { this.checkAutoSpinAttack(axisalignedbb, this.getBoundingBox()); } @@ -434,7 +434,7 @@ index ede58af96..c3b69f38e 100644 if (!this.level.isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) { this.hurt(DamageSource.DROWN, 1.0F); diff --git a/src/main/java/net/minecraft/world/level/SpawnerCreature.java b/src/main/java/net/minecraft/world/level/SpawnerCreature.java -index 424d0c589..fd6c35501 100644 +index dbe61b1cf..d2ff4528d 100644 --- a/src/main/java/net/minecraft/world/level/SpawnerCreature.java +++ b/src/main/java/net/minecraft/world/level/SpawnerCreature.java @@ -116,6 +116,7 @@ public final class SpawnerCreature { diff --git a/CraftBukkit-Patches/0009-Fix-Mob-Spawning-Relative-to-View-Distance.patch b/CraftBukkit-Patches/0009-Fix-Mob-Spawning-Relative-to-View-Distance.patch index 4efd9ab2..786e449b 100644 --- a/CraftBukkit-Patches/0009-Fix-Mob-Spawning-Relative-to-View-Distance.patch +++ b/CraftBukkit-Patches/0009-Fix-Mob-Spawning-Relative-to-View-Distance.patch @@ -1,4 +1,4 @@ -From d045a56b6353f16bbecc6e71d34198d75de84745 Mon Sep 17 00:00:00 2001 +From 9cce6d6642a82f4c5cb2e3015ebcb850fedc078b Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 17:29:54 +1000 Subject: [PATCH] Fix Mob Spawning Relative to View Distance @@ -77,10 +77,10 @@ index 06b684300..0bf98b0a9 100644 } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index e5df553a9..55af2f874 100644 +index acaf90301..0c0c29efe 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -174,4 +174,11 @@ public class SpigotWorldConfig +@@ -180,4 +180,11 @@ public class SpigotWorldConfig log( "Simulation Distance: " + simulationDistance ); } diff --git a/CraftBukkit-Patches/0011-Item-Despawn-Rate.patch b/CraftBukkit-Patches/0011-Item-Despawn-Rate.patch index 69d214f8..cd9d3532 100644 --- a/CraftBukkit-Patches/0011-Item-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0011-Item-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 7ed9026cbc2835163f114db48dc81bdd0833b21c Mon Sep 17 00:00:00 2001 +From 6fe7786d7cbf932dab0fd3f7a63c09e1f8ebce70 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 22 Sep 2013 19:10:53 +1000 Subject: [PATCH] Item Despawn Rate @@ -27,10 +27,10 @@ index 70c74e9c4..a5b0878c5 100644 public float getSpin(float f) { diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 55af2f874..9fc17f219 100644 +index 0c0c29efe..e3682d28c 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -181,4 +181,11 @@ public class SpigotWorldConfig +@@ -187,4 +187,11 @@ public class SpigotWorldConfig mobSpawnRange = (byte) getInt( "mob-spawn-range", 6 ); log( "Mob Spawn Range: " + mobSpawnRange ); } diff --git a/CraftBukkit-Patches/0012-Entity-Activation-Range.patch b/CraftBukkit-Patches/0012-Entity-Activation-Range.patch index dcc09a89..62ac6291 100644 --- a/CraftBukkit-Patches/0012-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0012-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From 2b05d6e6cc729522146ea25659cec322f8694b44 Mon Sep 17 00:00:00 2001 +From 7ea4d253495a7d5b249ed6ded7fce59a366939af Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -35,7 +35,7 @@ index 8ee75fb84..12485d1f7 100644 entity.setOldPosAndRot(); GameProfilerFiller gameprofilerfiller = this.getProfiler(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 0cda7a69a..02b460070 100644 +index 3ad91a6b4..051c5f35c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -302,6 +302,12 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma @@ -125,7 +125,7 @@ index 3a25f8858..0d5b9fc03 100644 public void tick() { super.tick(); diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java -index 31fb69264..fd5a7fdcf 100644 +index 08dba14a4..5cd20735b 100644 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java @@ -268,6 +268,13 @@ public abstract class EntityLiving extends Entity { @@ -221,7 +221,7 @@ index 5e4530883..95cdde462 100644 super(entitytypes, world); this.pickup = EntityArrow.PickupStatus.DISALLOWED; diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityFireworks.java b/src/main/java/net/minecraft/world/entity/projectile/EntityFireworks.java -index 1e8c5a659..5ff797d37 100644 +index b333ce06f..af48f31be 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/EntityFireworks.java +++ b/src/main/java/net/minecraft/world/entity/projectile/EntityFireworks.java @@ -81,6 +81,22 @@ public class EntityFireworks extends IProjectile implements ItemSupplier { @@ -530,10 +530,10 @@ index 000000000..1939b9856 + } +} diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 9fc17f219..8daa6784a 100644 +index e3682d28c..936279b5f 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -188,4 +188,21 @@ public class SpigotWorldConfig +@@ -194,4 +194,21 @@ public class SpigotWorldConfig itemDespawnRate = getInt( "item-despawn-rate", 6000 ); log( "Item Despawn Rate: " + itemDespawnRate ); } diff --git a/CraftBukkit-Patches/0014-Entity-Tracking-Ranges.patch b/CraftBukkit-Patches/0014-Entity-Tracking-Ranges.patch index d079da26..75c08898 100644 --- a/CraftBukkit-Patches/0014-Entity-Tracking-Ranges.patch +++ b/CraftBukkit-Patches/0014-Entity-Tracking-Ranges.patch @@ -1,4 +1,4 @@ -From 62575be885c5779417abfc2ee4aa7baf209c13f0 Mon Sep 17 00:00:00 2001 +From 7d72d5ec3e37c0ee71f86ba3b5c8efb5579cf9ed Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Feb 2013 11:58:47 -0500 Subject: [PATCH] Entity Tracking Ranges @@ -24,10 +24,10 @@ index 0bf98b0a9..967aa5582 100644 if (i != 0) { int j = entitytypes.updateInterval(); diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 8daa6784a..ee822b2a3 100644 +index 936279b5f..434a7632a 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -205,4 +205,19 @@ public class SpigotWorldConfig +@@ -211,4 +211,19 @@ public class SpigotWorldConfig ignoreSpectatorActivation = getBoolean( "entity-activation-range.ignore-spectators", ignoreSpectatorActivation ); log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Ra " + raiderActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers + " / Isa " + ignoreSpectatorActivation ); } diff --git a/CraftBukkit-Patches/0016-Hopper-Customisations.patch b/CraftBukkit-Patches/0016-Hopper-Customisations.patch index d36659d0..fcb8bd46 100644 --- a/CraftBukkit-Patches/0016-Hopper-Customisations.patch +++ b/CraftBukkit-Patches/0016-Hopper-Customisations.patch @@ -1,4 +1,4 @@ -From 26ec00207fe0d7179d3877a4f938892ac9c132f6 Mon Sep 17 00:00:00 2001 +From 96255c94703073b512bbdceb7bc527e3427707f4 Mon Sep 17 00:00:00 2001 From: erocs Date: Sun, 8 Sep 2013 12:06:15 -0700 Subject: [PATCH] Hopper Customisations @@ -144,10 +144,10 @@ index 80cbb3f6c..25cc1cca6 100644 Block block = iblockdata.getBlock(); diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index ee822b2a3..ecb1ecb2a 100644 +index 434a7632a..8377ecfb8 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -220,4 +220,22 @@ public class SpigotWorldConfig +@@ -226,4 +226,22 @@ public class SpigotWorldConfig otherTrackingRange = getInt( "entity-tracking-range.other", otherTrackingRange ); log( "Entity Tracking Range: Pl " + playerTrackingRange + " / An " + animalTrackingRange + " / Mo " + monsterTrackingRange + " / Mi " + miscTrackingRange + " / Other " + otherTrackingRange ); } diff --git a/CraftBukkit-Patches/0027-Arrow-Despawn-Rate.patch b/CraftBukkit-Patches/0027-Arrow-Despawn-Rate.patch index 94b3e9ea..5f429f69 100644 --- a/CraftBukkit-Patches/0027-Arrow-Despawn-Rate.patch +++ b/CraftBukkit-Patches/0027-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 5ba150cdc19c28bf216763b5a3f82c35aadb8281 Mon Sep 17 00:00:00 2001 +From e91508c6a3b2a7b016ebf60da110e8d60b3f21b6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 14 Oct 2013 19:20:10 +1100 Subject: [PATCH] Arrow Despawn Rate @@ -18,10 +18,10 @@ index 95cdde462..0f18feede 100644 } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index ecb1ecb2a..cb337b8d9 100644 +index 8377ecfb8..2dd50a03d 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -238,4 +238,13 @@ public class SpigotWorldConfig +@@ -244,4 +244,13 @@ public class SpigotWorldConfig hopperCanLoadChunks = getBoolean( "hopper-can-load-chunks", false ); log( "Hopper Transfer: " + hopperTransfer + " Hopper Check: " + hopperCheck + " Hopper Amount: " + hopperAmount + " Hopper Can Load Chunks: " + hopperCanLoadChunks ); } diff --git a/CraftBukkit-Patches/0031-Allow-Disabling-Zombie-Villager-Aggression.patch b/CraftBukkit-Patches/0031-Allow-Disabling-Zombie-Villager-Aggression.patch index ec8c7f08..866cddf0 100644 --- a/CraftBukkit-Patches/0031-Allow-Disabling-Zombie-Villager-Aggression.patch +++ b/CraftBukkit-Patches/0031-Allow-Disabling-Zombie-Villager-Aggression.patch @@ -1,4 +1,4 @@ -From c210425144e6b483ba90321fcaf179d78bcc8262 Mon Sep 17 00:00:00 2001 +From 321fcf28928e1015e84e045ac31ed613db7a294a Mon Sep 17 00:00:00 2001 From: Dylan Xaldin Date: Thu, 12 Dec 2013 18:05:03 -0600 Subject: [PATCH] Allow Disabling Zombie Villager Aggression @@ -19,10 +19,10 @@ index 25cc404f2..a442e4ace 100644 this.targetSelector.addGoal(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.BABY_ON_LAND_SELECTOR)); } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index cb337b8d9..82ec6ead5 100644 +index 2dd50a03d..5ec554072 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -247,4 +247,11 @@ public class SpigotWorldConfig +@@ -253,4 +253,11 @@ public class SpigotWorldConfig tridentDespawnRate = getInt( "trident-despawn-rate", arrowDespawnRate ); log( "Arrow Despawn Rate: " + arrowDespawnRate + " Trident Respawn Rate:" + tridentDespawnRate ); } diff --git a/CraftBukkit-Patches/0035-Add-Option-to-Nerf-Mobs-from-Spawners.patch b/CraftBukkit-Patches/0035-Add-Option-to-Nerf-Mobs-from-Spawners.patch index d0d670c8..8a2c6bb4 100644 --- a/CraftBukkit-Patches/0035-Add-Option-to-Nerf-Mobs-from-Spawners.patch +++ b/CraftBukkit-Patches/0035-Add-Option-to-Nerf-Mobs-from-Spawners.patch @@ -1,4 +1,4 @@ -From 73c4fdd22de052edeb243880da84e5775dc23279 Mon Sep 17 00:00:00 2001 +From 1e618db71e37fed96b345447242f10316d5a4048 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Feb 2014 16:55:46 +0000 Subject: [PATCH] Add Option to Nerf Mobs from Spawners @@ -22,10 +22,10 @@ index 2a5c24471..de82750c2 100644 if (!worldserver.tryAddFreshEntityWithPassengers(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { // CraftBukkit diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 82ec6ead5..ebca8eda0 100644 +index 5ec554072..b7d04ac15 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -254,4 +254,11 @@ public class SpigotWorldConfig +@@ -260,4 +260,11 @@ public class SpigotWorldConfig zombieAggressiveTowardsVillager = getBoolean( "zombie-aggressive-towards-villager", true ); log( "Zombie Aggressive Towards Villager: " + zombieAggressiveTowardsVillager ); } diff --git a/CraftBukkit-Patches/0040-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch b/CraftBukkit-Patches/0040-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch index 338f345e..14eb93cb 100644 --- a/CraftBukkit-Patches/0040-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch +++ b/CraftBukkit-Patches/0040-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch @@ -1,4 +1,4 @@ -From 86da44365631664e051f30eb150ad153e3b2bf70 Mon Sep 17 00:00:00 2001 +From dff6d2ba55b34d36bc8ec3aad817ac99658d8520 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Mon, 20 Jan 2014 20:18:23 +0000 Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks @@ -18,10 +18,10 @@ index 6a9860347..dd9b612e5 100644 blockposition = blockposition.below(); } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index ebca8eda0..c65935c9b 100644 +index b7d04ac15..89acf67f4 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -261,4 +261,11 @@ public class SpigotWorldConfig +@@ -267,4 +267,11 @@ public class SpigotWorldConfig nerfSpawnerMobs = getBoolean( "nerf-spawner-mobs", false ); log( "Nerfing mobs spawned from spawners: " + nerfSpawnerMobs ); } diff --git a/CraftBukkit-Patches/0050-Configurable-dragon-death-and-wither-spawn-sounds.patch b/CraftBukkit-Patches/0050-Configurable-dragon-death-and-wither-spawn-sounds.patch index 69f311ff..e79ae86f 100644 --- a/CraftBukkit-Patches/0050-Configurable-dragon-death-and-wither-spawn-sounds.patch +++ b/CraftBukkit-Patches/0050-Configurable-dragon-death-and-wither-spawn-sounds.patch @@ -1,4 +1,4 @@ -From 4382ad447226f7f57ca10d6e3b11219fe05cab69 Mon Sep 17 00:00:00 2001 +From 7a31f5b95355e34e092d35c6b18c0888417bf692 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 29 Mar 2014 13:44:25 -0400 Subject: [PATCH] Configurable dragon death and wither spawn sounds @@ -78,10 +78,10 @@ index e3c6fda40..f97c94517 100644 return EnumInteractionResult.CONSUME; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index c65935c9b..dd32a4ed9 100644 +index 89acf67f4..33d74abad 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -268,4 +268,22 @@ public class SpigotWorldConfig +@@ -274,4 +274,22 @@ public class SpigotWorldConfig enableZombiePigmenPortalSpawns = getBoolean( "enable-zombie-pigmen-portal-spawns", true ); log( "Allow Zombie Pigmen to spawn from portal blocks: " + enableZombiePigmenPortalSpawns ); } diff --git a/CraftBukkit-Patches/0064-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0064-Further-Seed-Customisation.patch index be81be44..d54f4057 100644 --- a/CraftBukkit-Patches/0064-Further-Seed-Customisation.patch +++ b/CraftBukkit-Patches/0064-Further-Seed-Customisation.patch @@ -1,4 +1,4 @@ -From 6584460e0801e2dc2da4eb8c55c05ee65bc508a8 Mon Sep 17 00:00:00 2001 +From 4c0e016e8c22e042410c82dd18191a53425257db Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 4 Jul 2014 13:28:45 +1000 Subject: [PATCH] Further Seed Customisation @@ -142,7 +142,7 @@ index e51494d21..c892ce881 100644 while (iterator.hasNext()) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index 9818d6271..ed86a0674 100644 +index d58076279..92eb9f055 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -221,7 +221,7 @@ public class CraftChunk implements Chunk { @@ -155,10 +155,10 @@ index 9818d6271..ed86a0674 100644 @Override diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index dd32a4ed9..9b4ab83b7 100644 +index 33d74abad..ad0a04ff9 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -286,4 +286,40 @@ public class SpigotWorldConfig +@@ -292,4 +292,40 @@ public class SpigotWorldConfig { endPortalSoundRadius = getInt( "end-portal-sound-radius", 0 ); } diff --git a/CraftBukkit-Patches/0075-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0075-Add-Hunger-Config-Values.patch index 73d9408c..61f3e8dd 100644 --- a/CraftBukkit-Patches/0075-Add-Hunger-Config-Values.patch +++ b/CraftBukkit-Patches/0075-Add-Hunger-Config-Values.patch @@ -1,4 +1,4 @@ -From ac3c0dd144f936978db408dff3e673ec731ea04c Mon Sep 17 00:00:00 2001 +From 659951f1dcb9f1fef9de2aff90e28406fe84063f Mon Sep 17 00:00:00 2001 From: lazertester Date: Sun, 17 Aug 2014 19:56:17 +1000 Subject: [PATCH] Add Hunger Config Values @@ -83,10 +83,10 @@ index 94531cafc..0dc5a9998 100644 } } else if (this.foodLevel <= 0) { diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 9b4ab83b7..84d81dd21 100644 +index ad0a04ff9..12a75a1c7 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -322,4 +322,30 @@ public class SpigotWorldConfig +@@ -328,4 +328,30 @@ public class SpigotWorldConfig log( "Custom Map Seeds: Village: " + villageSeed + " Desert: " + desertSeed + " Igloo: " + iglooSeed + " Jungle: " + jungleSeed + " Swamp: " + swampSeed + " Monument: " + monumentSeed + " Ocean: " + oceanSeed + " Shipwreck: " + shipwreckSeed + " End City: " + endCitySeed + " Slime: " + slimeSeed + " Nether: " + netherSeed + " Mansion: " + mansionSeed + " Fossil: " + fossilSeed + " Portal: " + portalSeed ); } diff --git a/CraftBukkit-Patches/0077-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0077-Limit-TNT-Detonations-per-tick.patch index 006c51ee..b311869d 100644 --- a/CraftBukkit-Patches/0077-Limit-TNT-Detonations-per-tick.patch +++ b/CraftBukkit-Patches/0077-Limit-TNT-Detonations-per-tick.patch @@ -1,4 +1,4 @@ -From f178668a85e543199b68814885dfd9b68c7d333c Mon Sep 17 00:00:00 2001 +From c57ec61ed43e4b463ab93f88523687551fe55124 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Aug 2014 18:12:32 -0400 Subject: [PATCH] Limit TNT Detonations per tick @@ -31,10 +31,10 @@ index 57f63aa83..b2019384b 100644 public void guardEntityTick(Consumer consumer, T t0) { diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 84d81dd21..deff97bd0 100644 +index 12a75a1c7..3e8869001 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -348,4 +348,15 @@ public class SpigotWorldConfig +@@ -354,4 +354,15 @@ public class SpigotWorldConfig sprintMultiplier = (float) getDouble( "hunger.sprint-multiplier", 0.1 ); otherMultiplier = (float) getDouble( "hunger.other-multiplier", 0.0 ); } diff --git a/CraftBukkit-Patches/0078-Configurable-Hanging-Tick.patch b/CraftBukkit-Patches/0078-Configurable-Hanging-Tick.patch index 9f23bf39..4b737184 100644 --- a/CraftBukkit-Patches/0078-Configurable-Hanging-Tick.patch +++ b/CraftBukkit-Patches/0078-Configurable-Hanging-Tick.patch @@ -1,4 +1,4 @@ -From 1a3b6498c0a724f29b4da76e89fe331ff43555ea Mon Sep 17 00:00:00 2001 +From e621921d480cd88570f6a45cb7758076186c34c9 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 9 Aug 2014 13:56:51 -0400 Subject: [PATCH] Configurable Hanging Tick @@ -18,10 +18,10 @@ index 7d28b5e45..1dde5897c 100644 if (!this.isRemoved() && !this.survives()) { // CraftBukkit start - fire break events diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index deff97bd0..78fdc0768 100644 +index 3e8869001..314a0f220 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -359,4 +359,10 @@ public class SpigotWorldConfig +@@ -365,4 +365,10 @@ public class SpigotWorldConfig maxTntTicksPerTick = getInt( "max-tnt-per-tick", 100 ); log( "Max TNT Explosions: " + maxTntTicksPerTick ); } diff --git a/CraftBukkit-Patches/0080-Allow-Capping-Tile-Entity-Tick-Time.patch b/CraftBukkit-Patches/0080-Allow-Capping-Tile-Entity-Tick-Time.patch index f0ad6332..42602ca9 100644 --- a/CraftBukkit-Patches/0080-Allow-Capping-Tile-Entity-Tick-Time.patch +++ b/CraftBukkit-Patches/0080-Allow-Capping-Tile-Entity-Tick-Time.patch @@ -1,4 +1,4 @@ -From 5339222efba0ba45f5fc249927dff2309a9fb781 Mon Sep 17 00:00:00 2001 +From 0dc3d72f176af476ce5300dc9c500a663be4d28a Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Feb 2015 21:39:31 +1100 Subject: [PATCH] Allow Capping (Tile)Entity Tick Time. @@ -68,10 +68,10 @@ index b2019384b..fde96ff46 100644 tickingblockentity.tick(); } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 78fdc0768..24888bc6d 100644 +index 314a0f220..fafddbef3 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -365,4 +365,13 @@ public class SpigotWorldConfig +@@ -371,4 +371,13 @@ public class SpigotWorldConfig { hangingTickFrequency = getInt( "hanging-tick-frequency", 100 ); } diff --git a/CraftBukkit-Patches/0083-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0083-Implement-SpawnerSpawnEvent.patch index eab53173..d7ba3862 100644 --- a/CraftBukkit-Patches/0083-Implement-SpawnerSpawnEvent.patch +++ b/CraftBukkit-Patches/0083-Implement-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 74cfe71a9be32a6f93a58aaad1bc23d3500e1826 Mon Sep 17 00:00:00 2001 +From ec295ee7b8cfc1845ad9588c985e22404eca3d56 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 3 Mar 2016 19:45:46 +1100 Subject: [PATCH] Implement SpawnerSpawnEvent. @@ -28,10 +28,10 @@ index de82750c2..69c64e7ac 100644 if (!worldserver.tryAddFreshEntityWithPassengers(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { // CraftBukkit this.delay(worldserver, blockposition); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 87a876b2d..559cf15df 100644 +index 8aabc1ae1..e9b2a8dfa 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -231,6 +231,8 @@ import org.bukkit.inventory.InventoryView; +@@ -233,6 +233,8 @@ import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.BookMeta; import org.bukkit.potion.PotionEffect; @@ -40,7 +40,7 @@ index 87a876b2d..559cf15df 100644 public class CraftEventFactory { public static final DamageSource MELTING = CraftDamageSource.copyOf(DamageSource.ON_FIRE); public static final DamageSource POISON = CraftDamageSource.copyOf(DamageSource.MAGIC); -@@ -1492,6 +1494,21 @@ public class CraftEventFactory { +@@ -1497,6 +1499,21 @@ public class CraftEventFactory { return event; } diff --git a/CraftBukkit-Patches/0088-Add-log-villager-deaths-option.patch b/CraftBukkit-Patches/0088-Add-log-villager-deaths-option.patch index f474f895..a2236ad9 100644 --- a/CraftBukkit-Patches/0088-Add-log-villager-deaths-option.patch +++ b/CraftBukkit-Patches/0088-Add-log-villager-deaths-option.patch @@ -1,14 +1,14 @@ -From 3d4fd5bb02f90e18214f1a80913750ca01c90a1d Mon Sep 17 00:00:00 2001 +From ad3b889a1daeedf329645c7885931a99ad9813c5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 14 Dec 2019 10:26:52 +1100 Subject: [PATCH] Add log-villager-deaths option diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java -index fd5a7fdcf..824baa171 100644 +index 5cd20735b..5227a23ef 100644 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java -@@ -1610,7 +1610,7 @@ public abstract class EntityLiving extends Entity { +@@ -1613,7 +1613,7 @@ public abstract class EntityLiving extends Entity { } if (!this.level.isClientSide && this.hasCustomName()) { diff --git a/CraftBukkit-Patches/0090-Configurable-Thunder-Chance.patch b/CraftBukkit-Patches/0090-Configurable-Thunder-Chance.patch index 8a58f1b7..4d788dd3 100644 --- a/CraftBukkit-Patches/0090-Configurable-Thunder-Chance.patch +++ b/CraftBukkit-Patches/0090-Configurable-Thunder-Chance.patch @@ -1,11 +1,11 @@ -From 04e2488730bc7e839f0dce5a3304ebe00c9649de Mon Sep 17 00:00:00 2001 +From 3824b0e6cde8636eab2389c6ddde388252ba5303 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 24 Oct 2021 20:29:25 +1100 Subject: [PATCH] Configurable Thunder Chance diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java -index 9499cdc66..41ffe24f8 100644 +index ce914a7b8..53e023792 100644 --- a/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java @@ -492,7 +492,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -18,10 +18,10 @@ index 9499cdc66..41ffe24f8 100644 if (this.isRainingAt(blockposition)) { DifficultyDamageScaler difficultydamagescaler = this.getCurrentDifficultyAt(blockposition); diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 24888bc6d..282ae1dc6 100644 +index fafddbef3..57be56742 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -374,4 +374,10 @@ public class SpigotWorldConfig +@@ -380,4 +380,10 @@ public class SpigotWorldConfig entityMaxTickTime = getInt("max-tick-time.entity", 50); log("Tile Max Tick Time: " + tileMaxTickTime + "ms Entity max Tick Time: " + entityMaxTickTime + "ms"); } diff --git a/CraftBukkit-Patches/0091-Configurable-Below-Zero-Generation.patch b/CraftBukkit-Patches/0091-Configurable-Below-Zero-Generation.patch index 9e6499b2..c9638afe 100644 --- a/CraftBukkit-Patches/0091-Configurable-Below-Zero-Generation.patch +++ b/CraftBukkit-Patches/0091-Configurable-Below-Zero-Generation.patch @@ -1,4 +1,4 @@ -From 9424b5fde06e992d165529618fd23b970d6bf3b4 Mon Sep 17 00:00:00 2001 +From cc560a7d5c3697852ac85b66978c3fad6f74bf07 Mon Sep 17 00:00:00 2001 From: DerFrZocker Date: Sun, 28 Nov 2021 12:09:29 +1100 Subject: [PATCH] Configurable Below Zero Generation @@ -51,10 +51,10 @@ index c47a8b670..aab9684a7 100644 + } } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 282ae1dc6..c23131b70 100644 +index 57be56742..c98fadd11 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -380,4 +380,9 @@ public class SpigotWorldConfig +@@ -386,4 +386,9 @@ public class SpigotWorldConfig { thunderChance = getInt("thunder-chance", 100000); }