Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47: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@bd097b4 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@8bae82d Use deserialised row keys in config tables (#7962)
PaperMC/Paper@3d37b42 Couple config fixes (#7975)
This commit is contained in:
BillyGalbreath
2022-06-13 22:07:53 -05:00
parent beb56e6e6c
commit 8e6f46b237
3 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,29 +40,6 @@ index 01f8d11ee4441a1c4d87427e3f9bcd7155259a5b..9e17e21a48892686e94a1c21b636695a
}
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
index 45152840f10c2e0731ac653595dc0e81557227c4..7d093e4cc3357abd205302a98cc7b06cf55229bc 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
@@ -67,7 +67,7 @@ public class Tadpole extends AbstractFish {
@Override
public Brain<Tadpole> getBrain() {
- return super.getBrain();
+ return (Brain<Tadpole>) super.getBrain(); // Purpur - decompile error
}
@Override
@@ -215,8 +215,7 @@ public class Tadpole extends AbstractFish {
}
private void ageUp() {
- Level frog = this.level;
- if (frog instanceof ServerLevel serverLevel) {
+ if (this.level instanceof ServerLevel serverLevel) { // Purpur - decompile error
Frog frog = EntityType.FROG.create(this.level);
frog.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
frog.finalizeSpawn(serverLevel, this.level.getCurrentDifficultyAt(frog.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData)null, (CompoundTag)null);
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