mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 04:56:50 +01:00
71c84c8132
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
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 c394c60f4e6b216be332c3585fbfbc4f32f9db30..5b612466db7c063bf0efbdaa3fcc575eb202ab21 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;
|
|
}
|
|
|