[Patch Request] MC-105068 and MC-238293

[maartix1]

Mojang Bug Report ID

MC-105068 and MC-238293

Bug adhere to the guidelines.

• I made sure that this bug adheres to the guidelines.

Has not already been requested.

• I am certain this patch has not already been requested.

Has not already been implemented.

• I know that this patch isn't already in the latest version of the mod.

Existing implementation

https://github.com/Walksy/ShieldFixes