From 9c1e6eab19258c9167e702f7b6ae86fa94ec6572 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 19 Sep 2020 12:29:53 +0100 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears 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: ccb9614e #548: LivingEntity - add methods for getting/setting invisibility CraftBukkit Changes: f8d4da08 #743: LivingEntity - add methods for getting/setting invisibility Spigot Changes: 17d78dbd Rebuild patches --- ...Add-methods-for-working-with-arrows-stuck-in-living-.patch | 4 ++-- ...Add-methods-for-working-with-arrows-stuck-in-living-.patch | 4 ++-- Spigot-Server-Patches/Entity-Origin-API.patch | 4 ++-- Spigot-Server-Patches/Timings-v2.patch | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch index 4a6b56a8d5..7bf465f971 100644 --- a/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-API-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource + * @return Whether the entity is invisible */ - @NotNull - public EntityCategory getCategory(); + public boolean isInvisible(); + + // Paper start + /** diff --git a/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch index 783d0a067c..c0fd3c8a40 100644 --- a/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -9,8 +9,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { - - throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Spigot."); + getHandle().persistentInvisibility = invisible; + getHandle().setFlag(5, invisible); } + + // Paper start diff --git a/Spigot-Server-Patches/Entity-Origin-API.patch b/Spigot-Server-Patches/Entity-Origin-API.patch index 0a6fd61ec1..35bf273d2a 100644 --- a/Spigot-Server-Patches/Entity-Origin-API.patch +++ b/Spigot-Server-Patches/Entity-Origin-API.patch @@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke - public boolean valid; public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only public boolean forceExplosionKnockback; // SPIGOT-949 + public boolean persistentInvisibility = false; + public org.bukkit.Location origin; // Paper // Spigot start public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this); @@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT"); @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke - this.getBukkitEntity().readBukkitValues(nbttagcompound); + } // CraftBukkit end + // Paper start - Restore the entity's origin location diff --git a/Spigot-Server-Patches/Timings-v2.patch b/Spigot-Server-Patches/Timings-v2.patch index 8f83f210c3..01ff1f09cf 100644 --- a/Spigot-Server-Patches/Timings-v2.patch +++ b/Spigot-Server-Patches/Timings-v2.patch @@ -1016,9 +1016,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 import org.bukkit.event.hanging.HangingBreakByEntityEvent; import org.bukkit.event.vehicle.VehicleBlockCollisionEvent; @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke - public boolean valid; public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only public boolean forceExplosionKnockback; // SPIGOT-949 + public boolean persistentInvisibility = false; - public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot // Spigot start public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this); diff --git a/work/Bukkit b/work/Bukkit index d75d8a38c4..ccb9614e95 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit d75d8a38c4baaa944290d524f27f9bea83770318 +Subproject commit ccb9614e9506fe08c159e1c566561bdacf03935d diff --git a/work/CraftBukkit b/work/CraftBukkit index da9bb3ea92..f8d4da08e1 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit da9bb3ea92c406be1ef4d35aecf092ec917fd6ca +Subproject commit f8d4da08e17c3b6e7147af8a945301535329bba3 diff --git a/work/Spigot b/work/Spigot index 2740d5aebd..17d78dbd13 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 2740d5aebd99bc6b79dc65e2491ae1fd85b64480 +Subproject commit 17d78dbd136932f09b61fced8a8c8439117d3e81