aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches-Unmapped/0093-Add-ability-to-configure-frosted_ice-properties.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches-Unmapped/0093-Add-ability-to-configure-frosted_ice-properties.patch')
-rw-r--r--Spigot-Server-Patches-Unmapped/0093-Add-ability-to-configure-frosted_ice-properties.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/Spigot-Server-Patches-Unmapped/0093-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches-Unmapped/0093-Add-ability-to-configure-frosted_ice-properties.patch
new file mode 100644
index 0000000000..c48a22b74f
--- /dev/null
+++ b/Spigot-Server-Patches-Unmapped/0093-Add-ability-to-configure-frosted_ice-properties.patch
@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: kashike <[email protected]>
+Date: Thu, 21 Apr 2016 23:51:55 -0700
+Subject: [PATCH] Add ability to configure frosted_ice properties
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+index 1942f5224aaebb18adb591d6f70a419cfc1a7bdd..5baccb8d50c135ab20c38ffd0690f585514ce5af 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -259,4 +259,14 @@ public class PaperWorldConfig {
+ private void useVanillaScoreboardColoring() {
+ useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false);
+ }
++
++ public boolean frostedIceEnabled = true;
++ public int frostedIceDelayMin = 20;
++ public int frostedIceDelayMax = 40;
++ private void frostedIce() {
++ this.frostedIceEnabled = this.getBoolean("frosted-ice.enabled", this.frostedIceEnabled);
++ this.frostedIceDelayMin = this.getInt("frosted-ice.delay.min", this.frostedIceDelayMin);
++ this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax);
++ log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
++ }
+ }
+diff --git a/src/main/java/net/minecraft/world/level/block/BlockIceFrost.java b/src/main/java/net/minecraft/world/level/block/BlockIceFrost.java
+index 7239a30bd4a5dc4ed09802eea8f7126485ebb635..e32e94868386ff06ff29254e6cc3bee9b446a293 100644
+--- a/src/main/java/net/minecraft/world/level/block/BlockIceFrost.java
++++ b/src/main/java/net/minecraft/world/level/block/BlockIceFrost.java
+@@ -30,6 +30,7 @@ public class BlockIceFrost extends BlockIce {
+
+ @Override
+ public void tickAlways(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, Random random) {
++ if (!worldserver.paperConfig.frostedIceEnabled) return; // Paper - add ability to disable frosted ice
+ if ((random.nextInt(3) == 0 || this.a(worldserver, blockposition, 4)) && worldserver.getLightLevel(blockposition) > 11 - (Integer) iblockdata.get(BlockIceFrost.a) - iblockdata.b((IBlockAccess) worldserver, blockposition) && this.e(iblockdata, (World) worldserver, blockposition)) {
+ BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
+ EnumDirection[] aenumdirection = EnumDirection.values();
+@@ -42,12 +43,12 @@ public class BlockIceFrost extends BlockIce {
+ IBlockData iblockdata1 = worldserver.getType(blockposition_mutableblockposition);
+
+ if (iblockdata1.a((Block) this) && !this.e(iblockdata1, (World) worldserver, blockposition_mutableblockposition)) {
+- worldserver.getBlockTickList().a(blockposition_mutableblockposition, this, MathHelper.nextInt(random, 20, 40));
++ worldserver.getBlockTickList().a(blockposition_mutableblockposition, this, MathHelper.nextInt(random, worldserver.paperConfig.frostedIceDelayMin, worldserver.paperConfig.frostedIceDelayMax)); // Paper - use configurable min/max delay
+ }
+ }
+
+ } else {
+- worldserver.getBlockTickList().a(blockposition, this, MathHelper.nextInt(random, 20, 40));
++ worldserver.getBlockTickList().a(blockposition, this, MathHelper.nextInt(random, worldserver.paperConfig.frostedIceDelayMin, worldserver.paperConfig.frostedIceDelayMax)); // Paper - use configurable min/max delay
+ }
+ }
+