aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAikar <[email protected]>2019-04-10 23:41:42 -0400
committerAikar <[email protected]>2019-04-10 23:41:42 -0400
commitab8bbdfd8008deb0241d6ed1c62345c24ed34bd8 (patch)
tree35e6240068b5971ab895bf3cf63dff0cb6f4eb4d
parent237250c08d805400105adb1ba342e4690a1d68ff (diff)
downloadPaper-ab8bbdfd8008deb0241d6ed1c62345c24ed34bd8.tar.gz
Paper-ab8bbdfd8008deb0241d6ed1c62345c24ed34bd8.zip
[CI-SKIP] [Auto] Rebuild Patches
A recent commit has been made that caused patches to be out of order, rebuilding
-rw-r--r--Spigot-API-Patches/0182-Add-Heightmap-API.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/Spigot-API-Patches/0182-Add-Heightmap-API.patch b/Spigot-API-Patches/0182-Add-Heightmap-API.patch
index ec46f777e9..6fff85ab55 100644
--- a/Spigot-API-Patches/0182-Add-Heightmap-API.patch
+++ b/Spigot-API-Patches/0182-Add-Heightmap-API.patch
@@ -1,4 +1,4 @@
-From 61d8f2edbf9a488e035f6308d126794e3fda2d9c Mon Sep 17 00:00:00 2001
+From 97898e8cdfaafac936acd015cabc188fc8584d97 Mon Sep 17 00:00:00 2001
From: Spottedleaf <[email protected]>
Date: Sat, 1 Dec 2018 19:00:36 -0800
Subject: [PATCH] Add Heightmap API
@@ -46,10 +46,10 @@ index 00000000..4cd9b5ed
+ SOLID_OR_LIQUID_NO_LEAVES;
+}
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index b4f3e8ce..b78b76f3 100644
+index 8352b77c..f1263600 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
-@@ -612,6 +612,33 @@ public class Location implements Cloneable, ConfigurationSerializable {
+@@ -610,6 +610,33 @@ public class Location implements Cloneable, ConfigurationSerializable {
return centerLoc;
}
@@ -84,10 +84,10 @@ index b4f3e8ce..b78b76f3 100644
* Creates explosion at this location with given power
*
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 3d8ff98a..4dc813f3 100644
+index 107f4173..dc9e8a76 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
-@@ -154,6 +154,68 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -153,6 +153,68 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public Block getHighestBlockAt(@NotNull Location location);