Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c4782f5 Add xp orb spawn reason for frogs (#8045)
PaperMC/Paper@95ac874 Add ZombieVillager conversion without entity event (#8111)
PaperMC/Paper@41238a4 [ci skip] Fixed typo in README (#8031)
This commit is contained in:
BillyGalbreath
2022-07-07 23:47:02 -05:00
parent 4ffb3e0ce5
commit 93c82c9783
4 changed files with 6 additions and 19 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Mending mends most damages equipment first
diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
index 4848f26a006f4d4df620ded526134b3b39e90d29..37fe86f0f6ea006f658cd6a68757c1c12ae32eb7 100644
index d6527396939d9a1dd2f1cfb6cb66dc64fa0e5332..cbeea12009ec89fb3223e6a9545485a9bc19c21f 100644
--- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
+++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
@@ -320,7 +320,7 @@ public class ExperienceOrb extends Entity {
@@ -322,7 +322,7 @@ public class ExperienceOrb extends Entity {
}
private int repairPlayerItems(Player player, int amount) {