core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Shane Freeder 2019-12-14 00:56:34 +00:00
parent bc447dc137
commit 12051feb76
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch
View File

@ -1,4 +1,4 @@
From e42bb2076e988a7257305c424389e160ab1997d9 Mon Sep 17 00:00:00 2001 From 9f486428618df2f388560f3141c62fe82262c626 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 15:12:22 -0400 Date: Fri, 18 Mar 2016 15:12:22 -0400
Subject: [PATCH] Configurable Non Player Arrow Despawn Rate 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 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 --- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/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 { @@ -266,7 +266,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
protected void i() { protected void i() {
++this.despawnCounter; ++this.despawnCounter;
- if (this.despawnCounter >= world.spigotConfig.arrowDespawnRate) { // Spigot - 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 : world.spigotConfig.arrowDespawnRate))) { // Spigot // Paper + 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(); this.die();
} }
-- --
2.24.0 2.24.1

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 16dc5758ae85ea956e97af0e8be8d3497d8c0bde Subproject commit 61d4b0902319ca7fceb0a85a1d574ad47cc9239c

2
work/Spigot

@ -1 +1 @@
Subproject commit f39a89ef2d9083acae5a1e09d5991409213b0a89 Subproject commit 047b6f86bc7927f729039fb212aae9ca676da019