mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 23:57:43 +01:00
69 lines
2.7 KiB
Diff
69 lines
2.7 KiB
Diff
From 4a4bbb0cb896d1d224da7e5b319061ecf14fdfce Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <Zbob750@live.com>
|
|
Date: Tue, 24 Jun 2014 07:44:59 -0500
|
|
Subject: [PATCH] Configurable cactus and reed natural growth heights
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
|
|
index f55e531..cc16f1d 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockCactus.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
|
|
@@ -4,6 +4,8 @@ import java.util.Random;
|
|
|
|
import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
|
|
|
|
+import org.github.paperspigot.PaperSpigotWorldConfig; // PaperSpigot
|
|
+
|
|
public class BlockCactus extends Block {
|
|
|
|
protected BlockCactus() {
|
|
@@ -20,7 +22,7 @@ public class BlockCactus extends Block {
|
|
;
|
|
}
|
|
|
|
- if (l < 3) {
|
|
+ if (l < PaperSpigotWorldConfig.cactusMaxHeight) { // PaperSpigot - Configurable natural growth heights
|
|
int i1 = world.getData(i, j, k);
|
|
|
|
if (i1 >= (byte) range(3, (world.growthOdds / world.spigotConfig.cactusModifier * 15) + 0.5F, 15)) { // Spigot
|
|
diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
|
|
index 6c04ad2..9d638fe 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockReed.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockReed.java
|
|
@@ -1,5 +1,7 @@
|
|
package net.minecraft.server;
|
|
|
|
+import org.github.paperspigot.PaperSpigotWorldConfig; // PaperSpigot
|
|
+
|
|
import java.util.Random;
|
|
|
|
public class BlockReed extends Block {
|
|
@@ -21,7 +23,7 @@ public class BlockReed extends Block {
|
|
;
|
|
}
|
|
|
|
- if (l < 3) {
|
|
+ if (l < PaperSpigotWorldConfig.reedMaxHeight) { // PaperSpigot - Configurable natural growth heights
|
|
int i1 = world.getData(i, j, k);
|
|
|
|
if (i1 >= (byte) range(3, (world.growthOdds / world.spigotConfig.caneModifier * 15) + 0.5F, 15)) { // Spigot
|
|
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
index 9f2c3dc..27be0a8 100644
|
|
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
@@ -95,4 +95,12 @@ public class PaperSpigotWorldConfig
|
|
{
|
|
playerBlockingDamageMultiplier = getFloat( "player-blocking-damage-multiplier", 0.5F );
|
|
}
|
|
+
|
|
+ public static int cactusMaxHeight;
|
|
+ public static int reedMaxHeight;
|
|
+ private void blockGrowthHeight()
|
|
+ {
|
|
+ cactusMaxHeight = getInt( "max-growth-height.cactus", 3 );
|
|
+ reedMaxHeight = getInt ( "max-growth-height.reeds", 3 );
|
|
+ }
|
|
}
|
|
--
|
|
1.9.1
|
|
|