Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

13
patches/server/0006-Fix-decompile-errors.patch
View File

@@ -27,19 +27,6 @@ index b6fc1b495e9173e625a7b2c856e79146734c4a9e..765dee56dd3a77e4bce137b84c413920
Optional<UUID> optional = this.getBrain().getMemory(MemoryModuleType.LIKED_PLAYER);
if (optional.isPresent() && player.getUUID().equals(optional.get())) {
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
index 056e4c2f7f632dadc0015710c032a0b718d46ff9..1fb11985dcfd07ded1f7cadf3fdba7d23ca4f87b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java