Spigot / CraftBukkit / d25e1e72252

Commits

Y2K_ authored and md_5 committed d25e1e72252 24 Sep 2024

#1481: Fix BeaconView#set[X]Effect(null)

Modified


28 28	}
29 29
30 30	@Nullable
31 31	@Override
32 32	public PotionEffectType getSecondaryEffect() {
33 33	return container.getSecondaryEffect() != null ? CraftPotionEffectType.minecraftHolderToBukkit(container.getSecondaryEffect()) : null;
34 34	}
35 35
36 36	@Override
37 37	public void setPrimaryEffect(@Nullable final PotionEffectType effectType) {
38 -	container.setData(TileEntityBeacon.DATA_PRIMARY, ContainerBeacon.encodeEffect(CraftPotionEffectType.bukkitToMinecraftHolder(effectType)));
38 +	container.setData(TileEntityBeacon.DATA_PRIMARY, ContainerBeacon.encodeEffect((effectType == null) ? null : CraftPotionEffectType.bukkitToMinecraftHolder(effectType)));
39 39	}
40 40
41 41	@Override
42 42	public void setSecondaryEffect(@Nullable final PotionEffectType effectType) {
43 -	container.setData(TileEntityBeacon.DATA_SECONDARY, ContainerBeacon.encodeEffect(CraftPotionEffectType.bukkitToMinecraftHolder(effectType)));
43 +	container.setData(TileEntityBeacon.DATA_SECONDARY, ContainerBeacon.encodeEffect((effectType == null) ? null : CraftPotionEffectType.bukkitToMinecraftHolder(effectType)));
44 44	}
45 45	}