geforkt von Mirrors/Paper
526795bacd
* Update patches to handle vineflower decompiler * update patches again to handle inlined simple lambdas * update vf again and re-apply/rebuild patches * update patches after removal of verify-merges flag * fix compile issue * remove maven local * fix some issues * address more issues * fix collision patch * use paperweight release * more fixes * update fineflower and fix patches again * add missing comment descriptor --------- Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
33 Zeilen
2.1 KiB
Diff
33 Zeilen
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: kashike <kashike@vq.lc>
|
|
Date: Thu, 21 Apr 2016 23:51:55 -0700
|
|
Subject: [PATCH] Add ability to configure frosted_ice properties
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java b/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java
|
|
index cabe67a97f3f9058d5671cb5a1a94ff4e9ef199b..1b61e5139d3183de8f9a375e8ef24d302861727d 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java
|
|
@@ -40,6 +40,7 @@ public class FrostedIceBlock extends IceBlock {
|
|
|
|
@Override
|
|
public void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
|
|
+ if (!world.paperConfig().environment.frostedIce.enabled) return; // Paper - Frosted ice options
|
|
if ((random.nextInt(3) == 0 || this.fewerNeigboursThan(world, pos, 4))
|
|
&& world.getMaxLocalRawBrightness(pos) > 11 - state.getValue(AGE) - state.getLightBlock(world, pos)
|
|
&& this.slightlyMelt(state, world, pos)) {
|
|
@@ -49,11 +50,11 @@ public class FrostedIceBlock extends IceBlock {
|
|
mutableBlockPos.setWithOffset(pos, direction);
|
|
BlockState blockState = world.getBlockState(mutableBlockPos);
|
|
if (blockState.is(this) && !this.slightlyMelt(blockState, world, mutableBlockPos)) {
|
|
- world.scheduleTick(mutableBlockPos, this, Mth.nextInt(random, 20, 40));
|
|
+ world.scheduleTick(mutableBlockPos, this, Mth.nextInt(random, world.paperConfig().environment.frostedIce.delay.min, world.paperConfig().environment.frostedIce.delay.max)); // Paper - Frosted ice options
|
|
}
|
|
}
|
|
} else {
|
|
- world.scheduleTick(pos, this, Mth.nextInt(random, 20, 40));
|
|
+ world.scheduleTick(pos, this, Mth.nextInt(random, world.paperConfig().environment.frostedIce.delay.min, world.paperConfig().environment.frostedIce.delay.max)); // Paper - Frosted ice options
|
|
}
|
|
}
|
|
|