Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@1c779c2 Update to 1.18.1 (#7076)
PaperMC/Paper@901fd94 [ci skip] Update README
This commit is contained in:
Encode42
2021-12-10 16:04:19 -05:00
parent 26e5f080f2
commit 1fd37bdec4
26 changed files with 86 additions and 86 deletions

View File

@@ -18,10 +18,10 @@ index 8be7a3527018f9f6ecb91576c928c255b3089342..68072fae050fb83735725f3dc2525bfc
if (entry != null) {
ItemStack itemstack = (ItemStack) entry.getValue();
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index f9b7292c2eb2588c9769fcd8f56cc8da5259e7ce..fd973d153a47a5911df7fdb183d7c9851cba1175 100644
index 66f808cabcf6a9a6584849b285f1c60133adc7b4..2238fb40af8c95494b0aec84a5a24cdbf4165da6 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -514,6 +514,16 @@ public final class ItemStack {
@@ -513,6 +513,16 @@ public final class ItemStack {
return this.isDamageableItem() && this.getDamageValue() > 0;
}