mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-05 19:25:11 +02:00
6f2009754d
At the time this was re-added, there was concern around how the JIT would handle the system property that enabled it. This shouldn't be a problem, and as such we no longer need to block access to it. The Vanilla Method Profiler will not provide much to most users however there is no harm in providing it as an option. For most users, the recommended and supported method for determining performance issues with Paper will continue to be Timings.
39 lines
1.9 KiB
Diff
39 lines
1.9 KiB
Diff
From 394ab9e7cb86fd104b5058737e73b0a476f0f251 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Mon, 23 Jan 2017 15:10:25 -0600
|
|
Subject: [PATCH] Do not allow a zero max height in BiomeJungle
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java
|
|
index 8f67cb36..8dc0b623 100644
|
|
--- a/src/main/java/net/minecraft/server/BiomeJungle.java
|
|
+++ b/src/main/java/net/minecraft/server/BiomeJungle.java
|
|
@@ -40,7 +40,11 @@ public class BiomeJungle extends BiomeBase {
|
|
super.a(world, random, blockposition);
|
|
int i = random.nextInt(16) + 8;
|
|
int j = random.nextInt(16) + 8;
|
|
- int k = random.nextInt(world.getHighestBlockYAt(blockposition.a(i, 0, j)).getY() * 2);
|
|
+ // Paper start - Don't allow a 0 height
|
|
+ int height = world.getHighestBlockYAt(blockposition.add(i, 0, j)).getY() * 2;
|
|
+ if (height < 1) height = 1;
|
|
+ int k = random.nextInt(height);
|
|
+ // Paper end
|
|
|
|
(new WorldGenMelon()).generate(world, random, blockposition.a(i, k, j));
|
|
WorldGenVines worldgenvines = new WorldGenVines();
|
|
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
|
|
index 6a0b3a62..38a7af58 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockPosition.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
|
|
@@ -42,6 +42,7 @@ public class BlockPosition extends BaseBlockPosition {
|
|
this(baseblockposition.getX(), baseblockposition.getY(), baseblockposition.getZ());
|
|
}
|
|
|
|
+ public BlockPosition add(double x, double y, double z) { return this.a(x, y, z); } // Paper - OBFHELPER
|
|
public BlockPosition a(double d0, double d1, double d2) {
|
|
return d0 == 0.0D && d1 == 0.0D && d2 == 0.0D ? this : new BlockPosition((double) this.getX() + d0, (double) this.getY() + d1, (double) this.getZ() + d2);
|
|
}
|
|
--
|
|
2.14.3
|
|
|