Upstream has released updates that appears to apply and compile correctly
Paper Changes:
9ffaa44a Also restrict height in the vanilla teleport command
f8609691 Add unsupported-settings section to config (piston tnt dupe config option) (#3565)
d7bb893c Document fixup commit way of modifing patches (#3423)
