Update upstream B/CB/S
--- work/Bukkit Submodule work/Bukkit aba2aaaf..949124e0: > SPIGOT-5121: Method to set PierceLevel of arrows --- work/CraftBukkit Submodule work/CraftBukkit c6997924..bf329334: > SPIGOT-5133: Throwing items into secondary end world portal causes crash > SPIGOT-5121: Method to set PierceLevel of arrows > SPIGOT-5122: Skip world#notify if sign has no world. > SPIGOT-5105: The EntityTag nbt tag disappears from preset armor_stand items. > SPIGOT-5106: Config option to prevent plugins with incompatible API's from loading --- work/Spigot Submodule work/Spigot 595711b0..935adb34: > SPIGOT-5088: Additional growth modifiers
This commit is contained in:
parent
edd3e778c4
commit
dafc3dbcd5
40 changed files with 338 additions and 435 deletions
|
@ -1,14 +1,14 @@
|
|||
From 06faff5e0489233fecbe3cb2fda7aa50d92f696f Mon Sep 17 00:00:00 2001
|
||||
From fc20f0c50630c3172e924b34dfa1e912b8728a74 Mon Sep 17 00:00:00 2001
|
||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||
Date: Fri, 4 Mar 2016 03:13:18 -0500
|
||||
Subject: [PATCH] Arrow pickup rule API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
|
||||
index 4460f6c9e..a1990fef2 100644
|
||||
index 88cebc00..b2bf62a5 100644
|
||||
--- a/src/main/java/org/bukkit/entity/AbstractArrow.java
|
||||
+++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
|
||||
@@ -111,4 +111,38 @@ public interface AbstractArrow extends Projectile {
|
||||
@@ -127,4 +127,38 @@ public interface AbstractArrow extends Projectile {
|
||||
*/
|
||||
CREATIVE_ONLY
|
||||
}
|
||||
|
@ -48,5 +48,5 @@ index 4460f6c9e..a1990fef2 100644
|
|||
+ // Paper end
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
2.22.0
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue