core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot) 

Upstream has released updates that appear 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:
315b69c1 SPIGOT-6349: Material#MOSSY_COBBLESTONE incorrectly claims it is a MultipleFacing block

CraftBukkit Changes:
a82b21297 BUILDTOOLS-569: development maven profile fails build on windows

Spigot Changes:
cd23533a Rebuild patches
This commit is contained in:
Aikar 2021-02-08 05:17:10 -05:00
parent 13a476e15d
commit 36a72cad30
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-API-Patches/0152-Material-API-additions.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Material API additions
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index f66cd342c2ec3e5d4f4ae5e68dda797c793c76a7..e203c5bfc1d1bf6b500ef8a4446d3aef182b8ecb 100644 index 27adc7afae3d32c36762b9355cb5210e187df795..2e959d195f7a5e723952e421aeaeeb463f07d3f5 100644
--- a/src/main/java/org/bukkit/Material.java --- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java
@@ -86,6 +86,7 @@ import org.jetbrains.annotations.Nullable; @@ -86,6 +86,7 @@ import org.jetbrains.annotations.Nullable;
@ -16,7 +16,7 @@ index f66cd342c2ec3e5d4f4ae5e68dda797c793c76a7..e203c5bfc1d1bf6b500ef8a4446d3aef
public enum Material implements Keyed { public enum Material implements Keyed {
//<editor-fold desc="Materials" defaultstate="collapsed"> //<editor-fold desc="Materials" defaultstate="collapsed">
AIR(9648, 0), AIR(9648, 0),
@@ -3565,6 +3566,22 @@ public enum Material implements Keyed { @@ -3562,6 +3563,22 @@ public enum Material implements Keyed {
} }
} }

4
Spigot-API-Patches/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Add a way to get translation keys for blocks, entities and
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index e203c5bfc1d1bf6b500ef8a4446d3aef182b8ecb..4ba991b79f13219182df35b4ce0c5cf57cbd208b 100644 index 2e959d195f7a5e723952e421aeaeeb463f07d3f5..2a3becabbd10fa8ffd19f35a3f6d8a6bfcb388c3 100644
--- a/src/main/java/org/bukkit/Material.java --- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java
@@ -3580,6 +3580,16 @@ public enum Material implements Keyed { @@ -3577,6 +3577,16 @@ public enum Material implements Keyed {
} }
return false; return false;
} }

2
work/Bukkit

@ -1 +1 @@
Subproject commit 1b5ad2af5decf1d2cd276ae391d75a8ab1167b15 Subproject commit 315b69c1d189f057263c5ac54c058352f706a8b9

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit b9b0c4e4a4127599e664e4aa85b2399c8124d0df Subproject commit a82b21297372bff77085d76f1fda58e8b0e2e1ab

2
work/Spigot

@ -1 +1 @@
Subproject commit 138d451b0c61bdc079b46e398ba4dfdc4bd6a233 Subproject commit cd23533a5b0ce59fcd0dd509be994b94d7c5f55e