Archiviert
13
0

[CI-SKIP] [Auto] Rebuild Patches

A recent commit has been made that caused patches to be out of order, rebuilding
Dieser Commit ist enthalten in:
Aikar 2019-04-10 23:41:42 -04:00
Ursprung 237250c08d
Commit ab8bbdfd80
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 401ADFC9891FAAFE

Datei anzeigen

@ -1,4 +1,4 @@
From 61d8f2edbf9a488e035f6308d126794e3fda2d9c Mon Sep 17 00:00:00 2001 From 97898e8cdfaafac936acd015cabc188fc8584d97 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com> From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 1 Dec 2018 19:00:36 -0800 Date: Sat, 1 Dec 2018 19:00:36 -0800
Subject: [PATCH] Add Heightmap API Subject: [PATCH] Add Heightmap API
@ -46,10 +46,10 @@ index 00000000..4cd9b5ed
+ SOLID_OR_LIQUID_NO_LEAVES; + SOLID_OR_LIQUID_NO_LEAVES;
+} +}
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java 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 --- a/src/main/java/org/bukkit/Location.java
+++ b/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; return centerLoc;
} }
@ -84,10 +84,10 @@ index b4f3e8ce..b78b76f3 100644
* Creates explosion at this location with given power * 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 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 --- a/src/main/java/org/bukkit/World.java
+++ b/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 @NotNull
public Block getHighestBlockAt(@NotNull Location location); public Block getHighestBlockAt(@NotNull Location location);