diff options
| author | Bjarne Koll <[email protected]> | 2024-05-08 03:18:57 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-07 18:18:57 -0700 |
| commit | eee55d019fe80372c2e08ccd1d0a94c066cda926 (patch) | |
| tree | d0629636ca789706138f53d55a78469a893bc7ad | |
| parent | 89ad61fd00b04db4bbd6124944d0a33c74e53ad9 (diff) | |
| download | Paper-eee55d019fe80372c2e08ccd1d0a94c066cda926.tar.gz Paper-eee55d019fe80372c2e08ccd1d0a94c066cda926.zip | |
Correctly compare holders in BeaconMenu (#10673)
| -rw-r--r-- | patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch index 1848692372..c15e6fbe0a 100644 --- a/patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch @@ -328,7 +328,7 @@ index 08dcc94c9eca9a5fd61055f05b7737ba5840b5bf..e0e5046c84941a8d17e18c177f3daea9 return 1; } diff --git a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java -index 5b6133f6758d322713321b7e918db0c3e0d4be51..7098bd97a30131dd7180ec2a4d4b485e3c6f9405 100644 +index 5b6133f6758d322713321b7e918db0c3e0d4be51..6173c689013ab02c83ca6ff1fde2b1e47f3e7820 100644 --- a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java +++ b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java @@ -178,6 +178,11 @@ public class BeaconMenu extends AbstractContainerMenu { @@ -336,7 +336,7 @@ index 5b6133f6758d322713321b7e918db0c3e0d4be51..7098bd97a30131dd7180ec2a4d4b485e public void updateEffects(Optional<Holder<MobEffect>> primary, Optional<Holder<MobEffect>> secondary) { + // Paper start - fix MC-174630 - validate secondary power -+ if (secondary.isPresent() && secondary.get().value() != net.minecraft.world.effect.MobEffects.REGENERATION && (primary.isPresent() && secondary.get() != primary.get())) { ++ if (secondary.isPresent() && secondary.get() != net.minecraft.world.effect.MobEffects.REGENERATION && (primary.isPresent() && secondary.get() != primary.get())) { + secondary = Optional.empty(); + } + // Paper end |