Rebuild patches

This commit is contained in:
BillyGalbreath
2020-12-12 18:19:48 -06:00
parent 0ae637c32d
commit ef0b93df2e
200 changed files with 1040 additions and 1041 deletions

View File

@@ -1,11 +1,11 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 2547b6f8fed3e3654510008ca0336b94e2400b27 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 14 Jul 2019 19:52:47 -0500
Subject: [PATCH] Mending mends most damages equipment first
diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
index 7b26359430..33e2dc3a10 100644
index 7b263594304a9b745f583fe7178ac16936cbd93b..33e2dc3a1003fe95fa71999fc24df84131238a6a 100644
--- a/src/main/java/net/minecraft/server/EnchantmentManager.java
+++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
@@ -251,7 +251,30 @@ public class EnchantmentManager {
@@ -41,7 +41,7 @@ index 7b26359430..33e2dc3a10 100644
return a(enchantment, entityliving, (itemstack) -> {
return true;
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
index c2be0c2bc3..358d6d6605 100644
index c2be0c2bc315876f120cff207e5516dda2bd55d7..358d6d660581686a2e8d49e13e8c2ade9ec2fec2 100644
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -220,7 +220,7 @@ public class EntityExperienceOrb extends Entity {
@@ -54,7 +54,7 @@ index c2be0c2bc3..358d6d6605 100644
if (entry != null) {
ItemStack itemstack = (ItemStack) entry.getValue();
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 2c908a6040..6a9b7e6094 100644
index 2c908a60401e851e56ec26e444d3c075cb256f24..6a9b7e609489244c4d239895de77033f58632d9d 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -418,10 +418,19 @@ public final class ItemStack {
@@ -78,7 +78,7 @@ index 2c908a6040..6a9b7e6094 100644
return this.tag == null ? 0 : this.tag.getInt("Damage");
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8039faa68f..b4e42c2e65 100644
index 97175fa5dc4d697118bb6391effef373bce110be..d61a96f0d9fc92780da0c698ffb4b903878a4198 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -112,6 +112,7 @@ public class PurpurWorldConfig {