[New build - DEFAULT] 25w30a: Hotfixes

Some more hotfixes

Bugfixes:
#6558 merging beam on children entity incorrect after reload
#6557 shield not working on long axis near border
#6555 Survival do not start