Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
807a677e SPIGOT-5558: Fix World#getHighestBlockAt, previously off by +1
This commit is contained in:
Shane Freeder
2020-02-03 01:54:02 +00:00
parent 77b05b9c8e
commit 3dafa6a08a
16 changed files with 69 additions and 69 deletions

View File

@@ -1,11 +1,11 @@
From e44e10db8320471ccff9da39048391ff83625a25 Mon Sep 17 00:00:00 2001
From c2974ae8735072bfab8a59203b89a130cb47643b 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 065cb3c29a..61faf87179 100644
index b506f5871..406e5c60a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -567,8 +567,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -20,11 +20,11 @@ index 065cb3c29a..61faf87179 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 c50301fd8a..426971b55b 100644
index e92566696..c0fc11857 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 {
return world.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, new BlockPosition(x, 0, z)).getY();
@@ -337,6 +337,29 @@ public class CraftWorld implements World {
return world.getChunkAt(x >> 4, z >> 4).a(HeightMap.Type.MOTION_BLOCKING, x, z);
}
+ // Paper start - Implement heightmap api