mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit)

Browse source 
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

Bukkit Changes:
5d4de46e Fix checkstyle.xml formatting
adf331f1 SPIGOT-5496: API to create and manipulate hardcore worlds

CraftBukkit Changes:
c727dc2a Fix checkstyle.xml formatting
e7202cd4 SPIGOT-5496: API to create and manipulate hardcore worlds
9820cd2d MC-151364, SPIGOT-5494: Feeding dolphin hangs if generate-structures=false
This commit is contained in:
Shane Freeder 2020-01-05 23:08:18 +00:00
commit bd1e1ad1aa
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
20 changed files with 140 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Spigot-Server-Patches/0367-Add-Heightmap-API.patch
View file

@ -1,11 +1,11 @@
From 681d0a4378f3e6101c324345238cb320cec62b6a Mon Sep 17 00:00:00 2001
From c507b3253f2d65b838333295c00ace47fd5c8c23 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 3e57546a3..59a1c6aae 100644
index 3e57546a36..59a1c6aae7 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,10 +20,10 @@ index 3e57546a3..59a1c6aae 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 7761af906..acd6a3a42 100644
index 816d59b614..0a91617290 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -341,6 +341,29 @@ public class CraftWorld implements World {
@@ -340,6 +340,29 @@ public class CraftWorld implements World {
return world.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, new BlockPosition(x, 0, z)).getY();
}