SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile fixes (#2732)

Browse Source
This commit is contained in:
MiniDigger | Martin
2019-12-12 19:45:00 +01:00
parent 3360d06f76
commit 8199a18b2b
28 changed files with 90 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/Configurable-cactus-and-reed-natural-growth-heights.patch
View File

@@ -23,7 +23,7 @@ index a73865739..098bd3fba 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
index 1e1d02dc7..4c82fe335 100644
index 1e1d02dc7..e0974e256 100644
--- a/src/main/java/net/minecraft/server/BlockCactus.java
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
@@ -0,0 +0,0 @@ public class BlockCactus extends Block {
@@ -31,12 +31,12 @@ index 1e1d02dc7..4c82fe335 100644
}
- if (i < 3) {
+ if (i < world.paperConfig.cactusMaxHeight) { // Paper - Configurable growth height
+ if (i < worldserver.paperConfig.cactusMaxHeight) { // Paper - Configurable growth height
int j = (Integer) iblockdata.get(BlockCactus.AGE);
if (j >= (byte) range(3, ((100.0F / worldserver.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 2106b0b49..baa2ed2b6 100644
index 2106b0b49..55b07444e 100644
--- a/src/main/java/net/minecraft/server/BlockReed.java
+++ b/src/main/java/net/minecraft/server/BlockReed.java
@@ -0,0 +0,0 @@ public class BlockReed extends Block {
@@ -44,7 +44,7 @@ index 2106b0b49..baa2ed2b6 100644
}
- if (i < 3) {
+ if (i < world.paperConfig.reedMaxHeight) { // Paper - Configurable growth height
+ if (i < worldserver.paperConfig.reedMaxHeight) { // Paper - Configurable growth height
int j = (Integer) iblockdata.get(BlockReed.AGE);
if (j >= (byte) range(3, ((100.0F / worldserver.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot