Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-29 05:55:44 +01:00
Code Issues Projects Releases Wiki Activity

[Auto] Updated Upstream (Bukkit/CraftBukkit)

Browse Source 
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:
9477fa26 #597: Implemented Material#getEquipmentSlot() method

CraftBukkit Changes:
35124087d #819: Implemented test for Material#getEquipmentSlot() method
This commit is contained in:
Aikar 2021-04-13 05:27:34 -04:00
parent 8756d232c6
commit 8a29f58942
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-API-Patches/0153-Material-API-additions.patch
View File

@ -5,10 +5,10 @@ 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 27adc7afae3d32c36762b9355cb5210e187df795..2e959d195f7a5e723952e421aeaeeb463f07d3f5 100644 index e4d0dc26fb2f2c4435e11b3460d8c93d6a6fc47f..2b53e68e96ea346a6f2b5cadcf9f81b2c231c408 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; @@ -87,6 +87,7 @@ import org.jetbrains.annotations.Nullable;
/** /**
* An enum of all material IDs accepted by the official server and client * An enum of all material IDs accepted by the official server and client
*/ */
@ -16,7 +16,7 @@ index 27adc7afae3d32c36762b9355cb5210e187df795..2e959d195f7a5e723952e421aeaeeb46
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),
@@ -3562,6 +3563,22 @@ public enum Material implements Keyed { @@ -3563,6 +3564,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 2e959d195f7a5e723952e421aeaeeb463f07d3f5..2a3becabbd10fa8ffd19f35a3f6d8a6bfcb388c3 100644 index 2b53e68e96ea346a6f2b5cadcf9f81b2c231c408..e453e5eb7245aad3ecbb19652ebb34abe030c0a9 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
@@ -3577,6 +3577,16 @@ public enum Material implements Keyed { @@ -3578,6 +3578,16 @@ public enum Material implements Keyed {
} }
return false; return false;
} }

8
Spigot-API-Patches/0276-Cache-the-result-of-Material-isBlock.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Cache the result of Material#isBlock
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 2a3becabbd10fa8ffd19f35a3f6d8a6bfcb388c3..7b77c7132723a01e8c38ddaa616b363be300b653 100644 index e453e5eb7245aad3ecbb19652ebb34abe030c0a9..112c3f035ec7e7a7cae939264e0af4c6f4450abd 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
@@ -3521,6 +3521,7 @@ public enum Material implements Keyed { @@ -3522,6 +3522,7 @@ public enum Material implements Keyed {
public final Class<?> data; public final Class<?> data;
private final boolean legacy; private final boolean legacy;
private final NamespacedKey key; private final NamespacedKey key;
@ -16,7 +16,7 @@ index 2a3becabbd10fa8ffd19f35a3f6d8a6bfcb388c3..7b77c7132723a01e8c38ddaa616b363b
private Material(final int id) { private Material(final int id) {
this(id, 64); this(id, 64);
@@ -3718,6 +3719,11 @@ public enum Material implements Keyed { @@ -3719,6 +3720,11 @@ public enum Material implements Keyed {
* @return true if this material is a block * @return true if this material is a block
*/ */
public boolean isBlock() { public boolean isBlock() {
@ -28,7 +28,7 @@ index 2a3becabbd10fa8ffd19f35a3f6d8a6bfcb388c3..7b77c7132723a01e8c38ddaa616b363b
switch (this) { switch (this) {
//<editor-fold defaultstate="collapsed" desc="isBlock"> //<editor-fold defaultstate="collapsed" desc="isBlock">
case ACACIA_BUTTON: case ACACIA_BUTTON:
@@ -4663,6 +4669,7 @@ public enum Material implements Keyed { @@ -4664,6 +4670,7 @@ public enum Material implements Keyed {
static { static {
for (Material material : values()) { for (Material material : values()) {
BY_NAME.put(material.name(), material); BY_NAME.put(material.name(), material);

4
Spigot-API-Patches/0283-Item-Rarity-API.patch
View File

@ -39,10 +39,10 @@ index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db202
+ } + }
+} +}
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 7b77c7132723a01e8c38ddaa616b363be300b653..0a31a5321ac519568db936c94394f71b2e2fcec1 100644 index 112c3f035ec7e7a7cae939264e0af4c6f4450abd..9b1c9e60dba9ea3ef8d8e164f13dd76daf57db8e 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
@@ -3588,6 +3588,17 @@ public enum Material implements Keyed { @@ -3589,6 +3589,17 @@ public enum Material implements Keyed {
public String getTranslationKey() { public String getTranslationKey() {
return Bukkit.getUnsafe().getTranslationKey(this); return Bukkit.getUnsafe().getTranslationKey(this);
} }

2
work/Bukkit

@ -1 +1 @@
Subproject commit b302317a9590f13ee937fa58941048c8b72fd9f8 Subproject commit 9477fa26f2d29dba3250b1486cd2b353d697b011

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 6b8cd9a7cb8f2ed94743d1ed4d4217c9a4138898 Subproject commit 35124087d2993a66a899a209e01fe467bbeebaa1