mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 07:20:24 +01:00
Do not allow a zero max height in BiomeJungle
Fixes GH-592 Thanks to the forge team who noticed this issue long ago
This commit is contained in:
parent
9e81fe5059
commit
21a724147a
2 changed files with 37 additions and 0 deletions
|
@ -0,0 +1,36 @@
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zach Brown <1254957+zachbr@users.noreply.github.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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/BiomeJungle.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/BiomeJungle.java
|
||||||
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/BlockPosition.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
|
||||||
|
@@ -0,0 +0,0 @@ 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);
|
||||||
|
}
|
||||||
|
--
|
|
@ -38,6 +38,7 @@ function import {
|
||||||
import AxisAlignedBB
|
import AxisAlignedBB
|
||||||
import BaseBlockPosition
|
import BaseBlockPosition
|
||||||
import BiomeBase
|
import BiomeBase
|
||||||
|
import BiomeJungle
|
||||||
import BiomeMesa
|
import BiomeMesa
|
||||||
import BlockChest
|
import BlockChest
|
||||||
import BlockFalling
|
import BlockFalling
|
||||||
|
|
Loading…
Reference in a new issue