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:
f52c70ab Fix incorrect nullability in MultipleFacing
6af4c0b2 SPIGOT-5311: Add API to get/set item associated with throwable projectiles
97aeae56 Add set/isAware to disable Vanilla AI components of a Mob

CraftBukkit Changes:
fba9f487 Improve legacy conversion of some materials that changed post flattening
b1ba8749 Move Bukkit.Aware loading/saving to correct location
f7cdb53c SPIGOT-5311: Add API to get/set item associated with throwable projectiles
689f429c #634: Cross platform patch scripts
ab85433d Add set/isAware to disable Vanilla AI components of a Mob

Spigot Changes:
8faa8b45 Rebuild patches
This commit is contained in:
Shane Freeder 2020-02-21 17:52:20 +00:00
parent 9f5fadcc7c
commit 9946cef8c5
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
43 changed files with 348 additions and 362 deletions

View file

@ -1,14 +1,14 @@
From ec42ead9c4a6ccdeacfa79e586ab6193fa601137 Mon Sep 17 00:00:00 2001
From 4f025823575c29539c54a5d3717c8fef62505445 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 16 Jun 2018 01:17:39 -0500
Subject: [PATCH] Make shield blocking delay configurable
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 7e8fc5b3..3e6da797 100644
index 371d342a..7f1f3dc6 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -523,5 +523,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -527,5 +527,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param arrows Number of arrows to stick in this entity
*/
void setArrowsStuck(int arrows);
@ -29,5 +29,5 @@ index 7e8fc5b3..3e6da797 100644
// Paper end
}
--
2.25.0.windows.1
2.25.0