Fixes #4020 - Githubissues

Description

Resolves #4020

[x] I have fully tested the proposed changes and promise that they will not break everything into chaos.
[x] I have also tested the proposed changes in combination with various popular addons and can confirm my changes do not break them.
[x] I have made sure that the proposed changes do not break compatibility across the supported Minecraft versions (1.16. - 1.20.).
[x] I followed the existing code standards and didn't mess up the formatting.
[x] I did my best to add documentation to any public classes or methods I added.
[x] I have added Nonnull and Nullable annotations to my methods to indicate their behaviour for null values
[x] I added sufficient Unit Tests to cover my code.