Skip to content

Prevent async projectile owner lookup during world gen #13643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HaHaWTH wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prevent async projectile owner lookup during world gen #13643

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion paper-server/patches/sources/net/minecraft/world/entity/projectile/Projectile.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

protected Projectile(EntityType<? extends Projectile> type, Level level) {
super(type, level);
@@ -51,12 +_,25 @@
@@ -51,12 +_,29 @@

protected void setOwner(@Nullable EntityReference<Entity> owner) {
this.owner = owner;
Expand All @@ -21,6 +21,10 @@

+ // Paper start - Refresh ProjectileSource for projectiles
+ public void refreshProjectileSource(boolean fillCache) {
+ // Prevent async owner lookup during world gen,
+ // saved structures with entity inside will cause this to throw an exception.
+ // In this situation, owner lookup will be handled by CB's AbstractProjecile#getShooter
+ if (this.generation) return;
+ if (fillCache) {
+ this.getOwner();
+ }
Expand Down
Loading