From 12051feb767a2cf9775beeb1c654085a8ce3eb7f Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 14 Dec 2019 00:56:34 +0000 Subject: [PATCH] Updated Upstream (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 CraftBukkit Changes: 61d4b090 SPIGOT-5428: Better handling of some ItemMeta Spigot Changes: 047b6f86 SPIGOT-5421: Add separate trident despawn rate c1047ed9 SPIGOT-5445: Add log-villager-deaths option --- ...65-Configurable-Non-Player-Arrow-Despawn-Rate.patch | 10 +++++----- work/CraftBukkit | 2 +- work/Spigot | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch index df33c895d..f6bf1359a 100644 --- a/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch +++ b/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From e42bb2076e988a7257305c424389e160ab1997d9 Mon Sep 17 00:00:00 2001 +From 9f486428618df2f388560f3141c62fe82262c626 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 15:12:22 -0400 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate @@ -30,18 +30,18 @@ index 2c20de281..64146effd 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 6723ffcca..fc70d50ac 100644 +index a9f843aad..2b14b2c3f 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -266,7 +266,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { protected void i() { ++this.despawnCounter; -- if (this.despawnCounter >= world.spigotConfig.arrowDespawnRate) { // Spigot -+ if (this.despawnCounter >= (fromPlayer == PickupStatus.CREATIVE_ONLY ? world.paperConfig.creativeArrowDespawnRate : (fromPlayer == PickupStatus.DISALLOWED ? world.paperConfig.nonPlayerArrowDespawnRate : world.spigotConfig.arrowDespawnRate))) { // Spigot // Paper +- if (this.despawnCounter >= ((this instanceof EntityThrownTrident) ? world.spigotConfig.tridentDespawnRate : world.spigotConfig.arrowDespawnRate)) { // Spigot ++ if (this.despawnCounter >= (fromPlayer == PickupStatus.CREATIVE_ONLY ? world.paperConfig.creativeArrowDespawnRate : (fromPlayer == PickupStatus.DISALLOWED ? world.paperConfig.nonPlayerArrowDespawnRate : ((this instanceof EntityThrownTrident) ? world.spigotConfig.tridentDespawnRate : world.spigotConfig.arrowDespawnRate)))) { // Spigot // Paper - TODO: Extract this to init? this.die(); } -- -2.24.0 +2.24.1 diff --git a/work/CraftBukkit b/work/CraftBukkit index 16dc5758a..61d4b0902 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 16dc5758ae85ea956e97af0e8be8d3497d8c0bde +Subproject commit 61d4b0902319ca7fceb0a85a1d574ad47cc9239c diff --git a/work/Spigot b/work/Spigot index f39a89ef2..047b6f86b 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit f39a89ef2d9083acae5a1e09d5991409213b0a89 +Subproject commit 047b6f86bc7927f729039fb212aae9ca676da019