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

Update upstream B/CB/S

Browse source
This commit is contained in:
Zach Brown 2018-10-27 00:02:22 -04:00
parent b1ab9ad452
commit c4865a6445
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
57 changed files with 380 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,14 +1,14 @@
From 30af6dcd81dc8b15be9306fe0bc16f3fe39203f7 Mon Sep 17 00:00:00 2001
From bffcdf28d7682a5c6c9094d680b691a7d8d71656 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 d699a8e18..dfb3f484f 100644
index 7770da71..3191aeca 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -408,5 +408,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
@@ -479,5 +479,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
* @param arrows Number of arrows to stick in this entity
*/
void setArrowsStuck(int arrows);
@ -29,5 +29,5 @@ index d699a8e18..dfb3f484f 100644
// Paper end
}
--
2.18.0
2.19.1