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

Updated Upstream (Bukkit/CraftBukkit)

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:
fd28180e #479: Add LivingEntity#attack, LivingEntity#swingMainHand, LivingEntity#swingOffHand
ae72ba3a SPIGOT-5591: Allow concurrent potion effects

CraftBukkit Changes:
3d61a853 Fix formatting in CraftLivingEntity
f7ab3055 #633: Add LivingEntity#attack, LivingEntity#swingMainHand, LivingEntity#swingOffHand
d5ef2eab SPIGOT-5591: Allow concurrent potion effects
25a9a9ff SPIGOT-5592: Custom ChunkGenerator can cause bugged dirt
3f6d0de9 Make it clear in error messages that api-version above 1.13 is also supported
This commit is contained in:
Shane Freeder 2020-02-25 18:57:15 +00:00
parent 0809d6be3e
commit b077005910
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
16 changed files with 77 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch
View file

@ -1,14 +1,14 @@
From 4f025823575c29539c54a5d3717c8fef62505445 Mon Sep 17 00:00:00 2001
From 071b34424f1f8e21825f757bfe107f01e49cfb31 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 371d342a..7f1f3dc6 100644
index ae712e76d..896b1971c 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -527,5 +527,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -554,5 +554,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param arrows Number of arrows to stick in this entity
*/
void setArrowsStuck(int arrows);