Updated Upstream (Bukkit/CraftBukkit/Spigot)
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: 564ed152 #482: Add a DragonBattle API to manipulate respawn phases etc 9f2fd967 #474: Add ability to set other plugin names as provided API so others can still depend on it CraftBukkit Changes: fc318cc1 #642: Add a DragonBattle API to manipulate respawn phases etc 796eb15a #644: Fix ChunkMapDistance#removeAllTicketsFor not propagating ticket level updates a6f80937 SPIGOT-5606: call BlockRedstoneEvent for fence gates Spigot Changes: a03b1fdb Rebuild patches
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
From c469162763fcd7293f6c41be4a49f2bc4190ee16 Mon Sep 17 00:00:00 2001
|
||||
From c9c4eeb2a922810a03372f2fef80f6de1e5c48fe 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 4aca398f1..20d9dd839 100644
|
||||
index 4aca398f10..20d9dd839c 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -571,8 +571,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||||
@@ -20,10 +20,10 @@ index 4aca398f1..20d9dd839 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 b41404652..d4ccef12f 100644
|
||||
index 06b2e8b910..693dc983cd 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -335,6 +335,29 @@ public class CraftWorld implements World {
|
||||
@@ -339,6 +339,29 @@ public class CraftWorld implements World {
|
||||
return getHighestBlockYAt(x, z, org.bukkit.HeightMap.MOTION_BLOCKING);
|
||||
}
|
||||
|
||||
@@ -54,5 +54,5 @@ index b41404652..d4ccef12f 100644
|
||||
public Location getSpawnLocation() {
|
||||
BlockPosition spawn = world.getSpawn();
|
||||
--
|
||||
2.25.1
|
||||
2.26.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user