mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
dc684c60d1
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
85 lines
4.6 KiB
Diff
85 lines
4.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Tue, 30 May 2023 12:59:10 -0700
|
|
Subject: [PATCH] Refresh ProjectileSource for projectiles
|
|
|
|
Makes sure the value returned by Projectile#getShooter in
|
|
the API matches the owner UUID specified in the entity nbt.
|
|
Previously, after the entity reloaded, Projectile#getShooter
|
|
would return null, while the entity still had an owner.
|
|
|
|
Also fixes setting the shooter/owner to null actually
|
|
clearing the owner.
|
|
|
|
Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
index c6d356fc0b94255299299eade9fb4b77bae8cc03..ce648d328ceb7d98fc523398c52915f7e7b5e23e 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -391,6 +391,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
public boolean inWorld = false;
|
|
public boolean generation;
|
|
public int maxAirTicks = this.getDefaultMaxAirSupply(); // CraftBukkit - SPIGOT-6907: re-implement LivingEntity#setMaximumAir()
|
|
+ @Nullable // Paper - Refresh ProjectileSource for projectiles
|
|
public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
|
|
public boolean lastDamageCancelled; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
|
|
public boolean persistentInvisibility = false;
|
|
diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
|
index d147f3cc1af28c384005c1c20e37bb588588c88d..5f7d152f41eb85f17bcded4bc8099b998e5a338b 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
|
@@ -57,14 +57,31 @@ public abstract class Projectile extends Entity implements TraceableEntity {
|
|
this.ownerUUID = entity.getUUID();
|
|
this.cachedOwner = entity;
|
|
}
|
|
- this.projectileSource = (entity != null && entity.getBukkitEntity() instanceof ProjectileSource) ? (ProjectileSource) entity.getBukkitEntity() : null; // CraftBukkit
|
|
-
|
|
+ // Paper start - Refresh ProjectileSource for projectiles
|
|
+ else {
|
|
+ this.ownerUUID = null;
|
|
+ this.cachedOwner = null;
|
|
+ this.projectileSource = null;
|
|
+ }
|
|
+ // Paper end - Refresh ProjectileSource for projectiles
|
|
+ this.refreshProjectileSource(false); // Paper
|
|
+ }
|
|
+ // Paper start - Refresh ProjectileSource for projectiles
|
|
+ public void refreshProjectileSource(boolean fillCache) {
|
|
+ if (fillCache) {
|
|
+ this.getOwner();
|
|
+ }
|
|
+ if (this.cachedOwner != null && !this.cachedOwner.isRemoved() && this.projectileSource == null && this.cachedOwner.getBukkitEntity() instanceof ProjectileSource projSource) {
|
|
+ this.projectileSource = projSource;
|
|
+ }
|
|
}
|
|
+ // Paper end - Refresh ProjectileSource for projectiles
|
|
|
|
@Nullable
|
|
@Override
|
|
public Entity getOwner() {
|
|
if (this.cachedOwner != null && !this.cachedOwner.isRemoved()) {
|
|
+ this.refreshProjectileSource(false); // Paper - Refresh ProjectileSource for projectiles
|
|
return this.cachedOwner;
|
|
} else {
|
|
if (this.ownerUUID != null) {
|
|
@@ -74,6 +91,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
|
|
ServerLevel worldserver = (ServerLevel) world;
|
|
|
|
this.cachedOwner = worldserver.getEntity(this.ownerUUID);
|
|
+ this.refreshProjectileSource(false); // Paper - Refresh ProjectileSource for projectiles
|
|
return this.cachedOwner;
|
|
}
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/AbstractProjectile.java b/src/main/java/org/bukkit/craftbukkit/entity/AbstractProjectile.java
|
|
index de4fb2654c7895cfd83ad694455ee56cb708c2f2..591af9d0d2fdc9953415979fc97a4a00afd85885 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/AbstractProjectile.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/AbstractProjectile.java
|
|
@@ -60,6 +60,7 @@ public abstract class AbstractProjectile extends CraftEntity implements Projecti
|
|
|
|
@Override
|
|
public final org.bukkit.projectiles.ProjectileSource getShooter() {
|
|
+ this.getHandle().refreshProjectileSource(true); // Paper - Refresh ProjectileSource for projectiles
|
|
return this.getHandle().projectileSource;
|
|
}
|
|
|