mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

8
Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
View file

@ -1,14 +1,14 @@
From 6edea23ef413c2a6d73d490367a10019e2693bfa Mon Sep 17 00:00:00 2001
From fce1924845cf533a2868e51bbd31ad9481d28349 Mon Sep 17 00:00:00 2001
From: mrapple <tony@oc.tc>
Date: Sun, 25 Nov 2012 13:47:27 -0600
Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index a5ea8f44..f5969cad 100644
index 88a93627..7d8f2447 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -500,4 +500,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -504,4 +504,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param <T> the type of the passed value
*/
<T> void setMemory(@NotNull MemoryKey<T> memoryKey, @Nullable T memoryValue);
@ -29,5 +29,5 @@ index a5ea8f44..f5969cad 100644
+ // Paper end
}
--
2.25.0.windows.1
2.25.0

8
Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch
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

8
Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch
View file

@ -1,4 +1,4 @@
From 72f2d9e3b8b64242408591a1b4f30517ca37fc18 Mon Sep 17 00:00:00 2001
From fe8992128dc14ba54cd5cbdb4f5fc8ce0ed8cb6d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 29 Jun 2018 00:19:19 -0400
Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
How long an entity has raised hands to charge an attack or use an item
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 3e6da797..d170149d 100644
index 7f1f3dc6..6df0c2cc 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -11,6 +11,7 @@ import org.bukkit.attribute.Attributable;
@ -17,7 +17,7 @@ index 3e6da797..d170149d 100644
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.projectiles.ProjectileSource;
@@ -537,5 +538,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -541,5 +542,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param delay Delay in ticks
*/
void setShieldBlockingDelay(int delay);
@ -51,5 +51,5 @@ index 3e6da797..d170149d 100644
// Paper end
}
--
2.25.0.windows.1
2.25.0

6
Spigot-API-Patches/0191-Entity-Jump-API.patch
View file

@ -1,4 +1,4 @@
From 282dc16c61aeacfab2e8ab1f38b75a6975f7701f Mon Sep 17 00:00:00 2001
From c3a9c52e09a66c5d9afc3f9a48959a7aad908d40 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 8 Feb 2020 23:26:18 -0600
Subject: [PATCH] Entity Jump API
@ -57,10 +57,10 @@ index 00000000..f0067c2e
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 240f276c..77f4246d 100644
index 9bc026ab..e69702e6 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -680,5 +680,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -684,5 +684,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @return Whether or not this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
*/
boolean isHandRaised();