aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch')
-rw-r--r--patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch85
1 files changed, 85 insertions, 0 deletions
diff --git a/patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch
new file mode 100644
index 0000000000..1e23e270a4
--- /dev/null
+++ b/patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch
@@ -0,0 +1,85 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+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 <[email protected]>
+
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index d24c2e23a12a196e1f6dc4f5c6d3c69472ddc704..c173ecd1283331afcf4db010e65764e5ed6e1eff 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -384,6 +384,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+ 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 0a207f3f2e4c0790e784fb4b0c3c2dfa49c39724..156809090f1f83ad68e7e2477a3cfddac5757a8e 100644
+--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
++++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+@@ -50,14 +50,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) {
+@@ -67,6 +84,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 c1c52f4fc5f900fac4098e5e37c52dfc4e82b8bb..236f94348ff8da661e23e3e17b7fc1b143680da9 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;
+ }
+