add back removed kelp modifier patch
This commit is contained in:
parent
1d5b298c19
commit
af4b5ee4f0
106 changed files with 21 additions and 21 deletions
patches/server
0794-Fix-kelp-modifier-changing-growth-for-other-crops.patch0795-Prevent-ContainerOpenersCounter-openCount-from-going.patch0796-Add-PlayerItemFrameChangeEvent.patch0797-Add-player-health-update-API.patch0798-Optimize-HashMapPalette.patch0799-Allow-delegation-to-vanilla-chunk-gen.patch0800-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch0801-Optimise-collision-checking-in-player-move-packet-ha.patch0802-Actually-unload-POI-data.patch0803-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch0804-Update-Log4j.patch0805-Add-more-Campfire-API.patch0806-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch0807-Fix-tripwire-state-inconsistency.patch0808-Fix-fluid-logging-on-Block-breakNaturally.patch0809-Forward-CraftEntity-in-teleport-command.patch0810-Improve-scoreboard-entries.patch0811-Entity-powdered-snow-API.patch0812-Add-API-for-item-entity-health.patch0813-Fix-entity-type-tags-suggestions-in-selectors.patch0814-Configurable-max-block-light-for-monster-spawning.patch0815-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch0816-Load-effect-amplifiers-greater-than-127-correctly.patch0817-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch0818-Fix-bees-aging-inside-hives.patch0819-Bucketable-API.patch0820-Check-player-world-in-endPortalSoundRadius.patch0821-Validate-usernames.patch0822-Fix-saving-configs-with-more-long-comments.patch0823-Make-water-animal-spawn-height-configurable.patch0824-Expose-vanilla-BiomeProvider-from-WorldInfo.patch0825-Add-config-option-for-worlds-affected-by-time-cmd.patch0826-Add-new-overload-to-PersistentDataContainer-has.patch0827-Multiple-Entries-with-Scoreboards.patch0828-Reset-placed-block-on-exception.patch0829-Add-configurable-height-for-slime-spawn.patch0830-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch0831-Fix-xp-reward-for-baby-zombies.patch0832-Kick-on-main-for-illegal-chars.patch0833-Multi-Block-Change-API-Implementation.patch0834-Freeze-Tick-Lock-API.patch0835-Dolphin-API.patch0836-More-PotionEffectType-API.patch0837-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch0838-API-for-creating-command-sender-which-forwards-feedb.patch0839-Add-config-for-stronghold-seed.patch0840-Implement-regenerateChunk.patch0841-Log-exceptions-thrown-during-chat-processing.patch0842-Fix-cancelled-powdered-snow-bucket-placement.patch0843-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch0844-Add-GameEvent-tags.patch0845-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch0846-Replace-ticket-level-propagator.patch0847-Furnace-RecipesUsed-API.patch0848-Configurable-sculk-sensor-listener-range.patch0849-Add-missing-block-data-mins-and-maxes.patch0850-Option-to-have-default-CustomSpawners-in-custom-worl.patch0851-Put-world-into-worldlist-before-initing-the-world.patch0852-Fix-Entity-Position-Desync.patch0853-Custom-Potion-Mixes.patch0854-Fix-Fluid-tags-isTagged-method.patch0855-Force-close-world-loading-screen.patch0856-Fix-falling-block-spawn-methods.patch0857-Expose-furnace-minecart-push-values.patch0858-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch0859-Fix-save-problems-on-shutdown.patch0860-More-Projectile-API.patch0861-Don-t-allow-vehicle-movement-from-players-while-tele.patch0862-Implement-getComputedBiome-API.patch0863-Make-some-itemstacks-nonnull.patch0864-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch0865-Implement-enchantWithLevels-API.patch0866-Fix-saving-in-unloadWorld.patch0867-Buffer-OOB-setBlock-calls.patch0868-Add-TameableDeathMessageEvent.patch0869-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch0870-fix-player-loottables-running-when-mob-loot-gamerule.patch0871-Ensure-entity-passenger-world-matches-ridden-entity.patch0872-Guard-against-invalid-entity-positions.patch0873-cache-resource-keys.patch0874-Allow-to-change-the-podium-for-the-EnderDragon.patch0875-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch0876-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch0877-Prevent-tile-entity-copies-loading-chunks.patch0878-Use-username-instead-of-display-name-in-PlayerList-g.patch0879-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch0880-Pass-ServerLevel-for-gamerule-callbacks.patch0881-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch0882-WorldCreator-keepSpawnLoaded.patch0883-Fix-NPE-for-BlockDataMeta-getBlockData.patch0884-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch0885-Add-EntityDyeEvent-and-CollarColorable-interface.patch0886-Fire-CauldronLevelChange-on-initial-fill.patch0887-fix-powder-snow-cauldrons-not-turning-to-water.patch0888-Sign-cleanup-filtering.patch0889-Add-PlayerStopUsingItemEvent.patch0890-FallingBlock-auto-expire-setting.patch0891-Don-t-tick-markers.patch0892-Do-not-accept-invalid-client-settings.patch0893-Add-support-for-Proxy-Protocol.patch
|
@ -11,22 +11,22 @@ Also fix above-mentioned modifiers from having the reverse effect
|
|||
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java b/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
|
||||
index 87dabe3c80b48bff52f2e3dbbaceb37a1a21e431..effee89e308c9a663938ac5b00a8c6512ce407c2 100644
|
||||
index 7d9056f9d841fbbdeaf1e323d818f2f1267b47e8..6659a96b3638265f128a352cc9f12629874bfb4b 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
|
||||
@@ -47,9 +47,17 @@ public class CaveVinesBlock extends GrowingPlantHeadBlock implements Bonemealabl
|
||||
|
||||
@Override
|
||||
protected BlockState getGrowIntoState(BlockState state, Random random) {
|
||||
protected BlockState getGrowIntoState(BlockState state, RandomSource random) {
|
||||
- return (BlockState) super.getGrowIntoState(state, random).setValue(CaveVinesBlock.BERRIES, random.nextFloat() < 0.11F);
|
||||
+ // Paper start
|
||||
+ return this.getGrowIntoState(state, random, null);
|
||||
}
|
||||
|
||||
+ @Override
|
||||
+ protected BlockState getGrowIntoState(BlockState state, Random random, Level level) {
|
||||
+ final boolean value = (level == null ? random.nextFloat() : random.nextFloat(100.00F / level.spigotConfig.glowBerryModifier)) < 0.11F;
|
||||
+ return super.getGrowIntoState(state, random).setValue(CaveVinesBlock.BERRIES, value);
|
||||
+ protected BlockState getGrowIntoState(BlockState state, RandomSource random, @javax.annotation.Nullable Level level) {
|
||||
+ final boolean value = random.nextFloat() < (level != null ? (0.11F * (level.spigotConfig.glowBerryModifier * 2)) : 0.11F);
|
||||
+ return (BlockState) super.getGrowIntoState(state, random).setValue(CaveVinesBlock.BERRIES, value);
|
||||
+ }
|
||||
+ // Paper end
|
||||
+
|
||||
|
@ -34,13 +34,13 @@ index 87dabe3c80b48bff52f2e3dbbaceb37a1a21e431..effee89e308c9a663938ac5b00a8c651
|
|||
public ItemStack getCloneItemStack(BlockGetter world, BlockPos pos, BlockState state) {
|
||||
return new ItemStack(Items.GLOW_BERRIES);
|
||||
diff --git a/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java b/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
|
||||
index def3b62feada5cebae4049883fa967b12f6f32b4..8e642ff6d387e05f900acfc3cf6cfa5975bf69e4 100644
|
||||
index ae9052efc48dc05c7b41cb18c4330d7e62839a07..4d1e1cf4c541793492a02681087a6242e7977acd 100644
|
||||
--- a/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
|
||||
@@ -40,16 +40,36 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
|
||||
|
||||
@Override
|
||||
public void randomTick(BlockState state, ServerLevel world, BlockPos pos, Random random) {
|
||||
public void randomTick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
|
||||
- if ((Integer) state.getValue(GrowingPlantHeadBlock.AGE) < 25 && random.nextDouble() < (100.0D / world.spigotConfig.kelpModifier) * this.growPerTickProbability) { // Spigot
|
||||
+ // Paper start
|
||||
+ final int modifier;
|
||||
|
@ -68,12 +68,12 @@ index def3b62feada5cebae4049883fa967b12f6f32b4..8e642ff6d387e05f900acfc3cf6cfa59
|
|||
}
|
||||
|
||||
+ // Paper start
|
||||
+ protected BlockState getGrowIntoState(BlockState state, Random random, Level level) {
|
||||
+ protected BlockState getGrowIntoState(BlockState state, RandomSource random, @javax.annotation.Nullable Level level) {
|
||||
+ return this.getGrowIntoState(state, random);
|
||||
+ }
|
||||
+ // Paper end
|
||||
+
|
||||
protected BlockState getGrowIntoState(BlockState state, Random random) {
|
||||
protected BlockState getGrowIntoState(BlockState state, RandomSource random) {
|
||||
return (BlockState) state.cycle(GrowingPlantHeadBlock.AGE);
|
||||
}
|
||||
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
|
@ -26,7 +26,7 @@ index 100de7e366c4ea8ce158b0fc0258e4db0ee83249..b13d4dc311f25f9d3132697381e52beb
|
|||
public int portalCreateRadius;
|
||||
public boolean portalSearchVanillaDimensionScaling;
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
index bdc6a7e6a9fcd467f653d53afd7ca2e33776fb06..e82bf53e1d31a5dd81713fe858d1e5d7b8f8c60d 100644
|
||||
index bdc6a7e6a9fcd467f653d53afd7ca2e33776fb06..7c17954fbd5ff4b8e6e57a5fd587f6e2d044b585 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
@@ -320,7 +320,11 @@ public class Slime extends Mob implements Enemy {
|
|
@ -6,7 +6,7 @@ Subject: [PATCH] API for creating command sender which forwards feedback
|
|||
|
||||
diff --git a/src/main/java/io/papermc/paper/commands/FeedbackForwardingSender.java b/src/main/java/io/papermc/paper/commands/FeedbackForwardingSender.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..ed3d488c6581df5eac425d9cccb8e741a52e91d5
|
||||
index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bff3914292
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/io/papermc/paper/commands/FeedbackForwardingSender.java
|
||||
@@ -0,0 +1,111 @@
|
|
@ -23,10 +23,10 @@ index 05c8b3f54ecb4221dcbf37574240401d93e14e7a..1af3570d080e8d2203434a52634e1eab
|
|||
int l = 0;
|
||||
int i1 = 0;
|
||||
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||||
index 32f8a6aed0f69ad07ab5b42fee38a3471a59d426..b7d8363a96aa4527d84a43060d7e0b567a570a15 100644
|
||||
index b498b027b127996976a394e9a86cfc90f8a8ed3b..31a447e6e156b7b244b2ac69a9c03c09c7ed388c 100644
|
||||
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||||
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
|
||||
@@ -352,6 +352,7 @@ public class SpigotWorldConfig
|
||||
@@ -364,6 +364,7 @@ public class SpigotWorldConfig
|
||||
public int mansionSeed;
|
||||
public int fossilSeed;
|
||||
public int portalSeed;
|
||||
|
@ -34,7 +34,7 @@ index 32f8a6aed0f69ad07ab5b42fee38a3471a59d426..b7d8363a96aa4527d84a43060d7e0b56
|
|||
private void initWorldGenSeeds()
|
||||
{
|
||||
this.villageSeed = this.getInt( "seed-village", 10387312 );
|
||||
@@ -369,6 +370,10 @@ public class SpigotWorldConfig
|
||||
@@ -381,6 +382,10 @@ public class SpigotWorldConfig
|
||||
this.mansionSeed = this.getInt( "seed-mansion", 10387319 );
|
||||
this.fossilSeed = this.getInt( "seed-fossil", 14357921 );
|
||||
this.portalSeed = this.getInt( "seed-portal", 34222645 );
|
|
@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..cb78a3d4e21376ea24347187478525d5
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 1d9fc45d3fcf8a704f9bb286daa13ba027215f0a..3795f867ff439a3bce293aa6ad3754a1e218e8a8 100644
|
||||
index 1d9fc45d3fcf8a704f9bb286daa13ba027215f0a..5706c8ded10f775c4834c1c9c3ed4be4c7afde55 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2545,6 +2545,15 @@ public final class CraftServer implements Server {
|
|
@ -23,7 +23,7 @@ index dc585e962033c991f323d41a8a34e791a7cebe80..5bc41ec40452a81659d80edb3e28a8a7
|
|||
|
||||
if (worlddata.getCustomBossEvents() != null) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 3795f867ff439a3bce293aa6ad3754a1e218e8a8..93aa05cf65b4f31804b9b33081f181999be2a986 100644
|
||||
index 5706c8ded10f775c4834c1c9c3ed4be4c7afde55..cdf1530b2ddbaef1a27e872b6600987ce18cda2b 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1231,10 +1231,11 @@ public final class CraftServer implements Server {
|
|
@ -164,7 +164,7 @@ index 3d688e334c7287f41460bd866bfd1155e8bb55d2..55006724ccec9f3de828ec18693728e9
|
|||
|
||||
@Override
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 93aa05cf65b4f31804b9b33081f181999be2a986..1b4fcbbbbb9b006814bd4a43f1c0001b59c759ef 100644
|
||||
index cdf1530b2ddbaef1a27e872b6600987ce18cda2b..eb3b53c40fcb4a4b975b8bf43e4c4cf636c44395 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -279,6 +279,7 @@ public final class CraftServer implements Server {
|
|
@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld
|
|||
Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 1b4fcbbbbb9b006814bd4a43f1c0001b59c759ef..678a611feec69125df9be047652fe48c0cb11a4d 100644
|
||||
index eb3b53c40fcb4a4b975b8bf43e4c4cf636c44395..05f79097ec240d5f58b38909bc31e90727f6d6b5 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1279,7 +1279,7 @@ public final class CraftServer implements Server {
|
|
@ -7,7 +7,7 @@ Fixes MC-50647 by just checking if the spawn type is a SPAWNER
|
|||
and then bypassing the spawn check logic if on slimes if it is.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
index e82bf53e1d31a5dd81713fe858d1e5d7b8f8c60d..012aae6ad413e7520d3ac9fe2a4aa1e0594f5dfd 100644
|
||||
index 7c17954fbd5ff4b8e6e57a5fd587f6e2d044b585..0c5ca7fabb7dc95587bae72d714d4712bdf0cc40 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
|
||||
@@ -320,6 +320,11 @@ public class Slime extends Mob implements Enemy {
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
|
|||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 678a611feec69125df9be047652fe48c0cb11a4d..88eac456dbcd53484109692d9aa898e174bff145 100644
|
||||
index 05f79097ec240d5f58b38909bc31e90727f6d6b5..436f8faa37e5e19e053aab6739ecca33a8851527 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1238,6 +1238,7 @@ public final class CraftServer implements Server {
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue