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

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur group = org.purpurmc.purpur
version = 1.19-R0.1-SNAPSHOT version = 1.19-R0.1-SNAPSHOT
paperCommit = 6ea73e7d637a368ab56b382068f80e984e9c18c2 paperCommit = 41238a4e246017cbbc9cdd066253b99e7279e086
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

View File

@@ -27,19 +27,6 @@ index b6fc1b495e9173e625a7b2c856e79146734c4a9e..765dee56dd3a77e4bce137b84c413920
Optional<UUID> optional = this.getBrain().getMemory(MemoryModuleType.LIKED_PLAYER); Optional<UUID> optional = this.getBrain().getMemory(MemoryModuleType.LIKED_PLAYER);
if (optional.isPresent() && player.getUUID().equals(optional.get())) { if (optional.isPresent() && player.getUUID().equals(optional.get())) {
return false; return false;
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
index 01f8d11ee4441a1c4d87427e3f9bcd7155259a5b..9e17e21a48892686e94a1c21b636695ab84eb7cd 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
@@ -105,7 +105,7 @@ public class Frog extends Animal {
@Override
public Brain<Frog> getBrain() {
- return super.getBrain();
+ return (Brain<Frog>) super.getBrain(); // Purpur - decompile error
}
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
index 056e4c2f7f632dadc0015710c032a0b718d46ff9..1fb11985dcfd07ded1f7cadf3fdba7d23ca4f87b 100644 index 056e4c2f7f632dadc0015710c032a0b718d46ff9..1fb11985dcfd07ded1f7cadf3fdba7d23ca4f87b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java

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 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 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
+++ b/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) { private int repairPlayerItems(Player player, int amount) {

View File

@@ -9,10 +9,10 @@ players still only pick up one orb every tick. However, setting this
to any negative number will pick up all orbs instantly. to any negative number will pick up all orbs instantly.
diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
index 37fe86f0f6ea006f658cd6a68757c1c12ae32eb7..d6ee7b9d2fafbe76d4705a182ae1a0e98ce91eef 100644 index cbeea12009ec89fb3223e6a9545485a9bc19c21f..b10c792a4f743bdb8a10fe1693def562d161a879 100644
--- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
+++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
@@ -301,8 +301,8 @@ public class ExperienceOrb extends Entity { @@ -303,8 +303,8 @@ public class ExperienceOrb extends Entity {
@Override @Override
public void playerTouch(Player player) { public void playerTouch(Player player) {
if (!this.level.isClientSide) { if (!this.level.isClientSide) {
@@ -37,7 +37,7 @@ index 870e794392b94d140db6d5650c3e7ae3dd6f593d..7344324517fb10ee6ab3467b40fcb9cd
} else if (!entity.isRemoved()) { } else if (!entity.isRemoved()) {
this.touch(entity); this.touch(entity);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ab53d43d26e01cb7ea5725bbda8b0a8a708a086c..6f14dac3a428e8d982a172c5c510e424cf09ecf6 100644 index 62c2bd8988815b5afe54a26e328bf75a758ffab4..ce6744240e4e57aef9f5d452047f103068e37b91 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -416,6 +416,7 @@ public class PurpurWorldConfig { @@ -416,6 +416,7 @@ public class PurpurWorldConfig {