mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 09:27:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes:aa8a835912aa8a8359127d48a46bc27d48a46bc26852c657cd6852c657cd
This commit is contained in:
@@ -588,10 +588,10 @@ index 14986911b4d0099ea2c91ab2196a771b7dee4c50..d1eed20ea3b27f0800a08b42b62aac40
|
||||
@NotNull
|
||||
public static WorldCreator ofKey(@NotNull NamespacedKey worldKey) {
|
||||
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
|
||||
index 0dd0beee6800fb34520dfa2d05e5bdda76624d64..bd91840378e036b99bb8e038e91a56d2165c193d 100644
|
||||
index 5f35ba35f8517ec28c1b21b3007c9a20dea097a7..cc058cb90d5343fed28a68855e8f2c311b16f29e 100644
|
||||
--- a/src/main/java/org/bukkit/block/Block.java
|
||||
+++ b/src/main/java/org/bukkit/block/Block.java
|
||||
@@ -184,6 +184,9 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
|
||||
@@ -186,6 +186,9 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
|
||||
* {@code int z = (int) ((packed << 10) >> 37);}
|
||||
* </p>
|
||||
*
|
||||
@@ -599,8 +599,8 @@ index 0dd0beee6800fb34520dfa2d05e5bdda76624d64..bd91840378e036b99bb8e038e91a56d2
|
||||
+ * @param y Y coordinate
|
||||
+ * @param z Z coordinate
|
||||
* @return This block's x, y, and z coordinates packed into a long value
|
||||
* @deprecated only encodes y block ranges from -512 to 511 and represents an already changed implementation detail
|
||||
*/
|
||||
public static long getBlockKey(int x, int y, int z) {
|
||||
diff --git a/src/main/java/org/bukkit/block/Lidded.java b/src/main/java/org/bukkit/block/Lidded.java
|
||||
index 30c7df0021df44a411e50636d906d4a1d30fd927..73930312accf6d8c5d71777caa8190a15c2f036d 100644
|
||||
--- a/src/main/java/org/bukkit/block/Lidded.java
|
||||
|
||||
Reference in New Issue
Block a user