1.15.2 update (#2887)

Functional GUI fix added by billygalbreath
This commit is contained in:
Spottedleaf 2020-01-21 18:02:07 -08:00 committed by Zach
commit 19de9af63c
624 changed files with 2369 additions and 2370 deletions

View file

@ -1,11 +1,11 @@
From c507b3253f2d65b838333295c00ace47fd5c8c23 Mon Sep 17 00:00:00 2001
From 7b721e8893480246abe64b581c87da17ea868e51 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 1 Jan 2019 02:22:01 -0800
Subject: [PATCH] Add Heightmap API
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 3e57546a36..59a1c6aae7 100644
index 13ff6a11f..6fd6c343d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -594,8 +594,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -20,7 +20,7 @@ index 3e57546a36..59a1c6aae7 100644
if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 816d59b614..0a91617290 100644
index 20e4be0e3..007a74f90 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -340,6 +340,29 @@ public class CraftWorld implements World {
@ -54,5 +54,5 @@ index 816d59b614..0a91617290 100644
public Location getSpawnLocation() {
BlockPosition spawn = world.getSpawn();
--
2.24.1
2.25.0.windows.1