Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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@e6f8284 Updated Upstream (Bukkit/CraftBukkit) (#8270)
This commit is contained in:
BillyGalbreath
2022-08-09 08:39:25 -05:00
parent d7b3ae90ce
commit b1925ac31f
18 changed files with 56 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,29 +4,6 @@ Date: Sun, 12 Jun 2022 06:20:21 -0500
Subject: [PATCH] Fix decompile errors
diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
index 2bc8917b7c4512f0607f34b1f18627a391fda07d..b5172f14606981a1e787d662a1cbed9d710071aa 100644
--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
@@ -118,7 +118,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
@Override
public Brain<Allay> getBrain() {
- return super.getBrain();
+ return (Brain<Allay>) super.getBrain(); // Purpur - decompile error
}
public static AttributeSupplier.Builder createAttributes() {
@@ -174,8 +174,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
@Override
public boolean hurt(DamageSource source, float amount) {
- Entity optional = source.getEntity();
- if (optional instanceof Player player) {
+ if (source.getEntity() instanceof Player player) { // Purpur - decompile error
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/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