Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 08:57:35 +01:00
Code Issues Projects Releases Wiki Activity

Add ability to disable, and to set min/max next tick delay, of frosted_ice. Resolves #172

Browse Source
This commit is contained in:
kashike 2016-04-21 23:54:34 -07:00
parent 0cfd3c0dc6
commit db8f9e663c
No known key found for this signature in database
GPG Key ID: AD82FC06E20025A3
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Spigot-Server-Patches/0144-Add-ability-to-configure-frosted_ice-properties.patch Normal file
View File

@ -0,0 +1,48 @@
From bfef45a85225f02bc0c1ec53b899104c809a4fe0 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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 77fb334..9a9e2eb 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -329,4 +329,14 @@ public class PaperWorldConfig {
maxMobSpawnAttempts = getInt("max-mob-spawn-attempts", 50);
log( "Max Mob Spawn Attempts: " + maxMobSpawnAttempts);
}
+
+ 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);
+ this.log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax);
+ }
}
diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
index d8ddf83..0f70734 100644
--- a/src/main/java/net/minecraft/server/BlockIceFrost.java
+++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
@@ -19,10 +19,14 @@ public class BlockIceFrost extends BlockIce {
}
public void b(World world, BlockPosition blockposition, IBlockData iblockdata, Random random) {
+ if (!world.paperConfig.frostedIceEnabled) return; // Paper - add ability to disable frosted ice
if ((random.nextInt(3) == 0 || this.c(world, blockposition) < 4) && world.getLightLevel(blockposition) > 11 - ((Integer) iblockdata.get(BlockIceFrost.a)).intValue() - iblockdata.c()) {
this.a(world, blockposition, iblockdata, random, true);
} else {
- world.a(blockposition, (Block) this, MathHelper.nextInt(random, 20, 40));
+ // Paper start - use configurable min/max delay
+ //world.a(blockposition, (Block) this, MathHelper.nextInt(random, 20, 40));
+ world.a(blockposition, this, MathHelper.nextInt(random, world.paperConfig.frostedIceDelayMin, world.paperConfig.frostedIceDelayMax));
+ // Paper end
}
}
--
2.7.4

1
scripts/importmcdev.sh
View File

@ -40,6 +40,7 @@ import BlockChest
import BlockFalling import BlockFalling
import BlockFluids import BlockFluids
import BlockFurnace import BlockFurnace
import BlockIceFrost
import BlockPosition import BlockPosition
import BlockStateList import BlockStateList
import ChunkProviderFlat import ChunkProviderFlat