Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 02:55:47 +01:00
Code Issues Projects Releases Wiki Activity

Actually fix compilation

Browse Source
This commit is contained in:
Shane Freeder 2019-05-22 05:21:19 +01:00
parent d9ad4e8bd8
commit 1956e5a5f4
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,22 +1,14 @@
From 6eb5b89c602482c737c039e182bca4b0f1031950 Mon Sep 17 00:00:00 2001
From f133052d9aa3253191db6c03132f36d2a6c5a553 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 e6249c2bf..2a4e4cb39 100644
index e6249c2bf..5697728ce 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -476,6 +476,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
boolean isCollidable();
+<<<<<<< HEAD
/**
* Returns the value of the memory specified.
* <p>
@@ -500,4 +501,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -500,4 +500,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);

6
Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch
View File

@ -1,14 +1,14 @@
From 397522a209a9ca5af469a8c11502d0354df6bed1 Mon Sep 17 00:00:00 2001
From 71decde1e8308ca10fd40b21d795c443aa04e5ce 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 ba7881a27..a663d7ab1 100644
index ffbf3d7a8..e08dfe17f 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -524,5 +524,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -523,5 +523,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param arrows Number of arrows to stick in this entity
*/
void setArrowsStuck(int arrows);

6
Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
View File

@ -1,4 +1,4 @@
From b4f1678a42edf3bf41e4e2659b68a0c2be2e66e8 Mon Sep 17 00:00:00 2001
From 17fb95b5f4231afd377f2067961a63c8deeb9c0c 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 a663d7ab1..adae86709 100644
index e08dfe17f..6e3284b20 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 a663d7ab1..adae86709 100644
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.projectiles.ProjectileSource;
@@ -538,5 +539,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -537,5 +538,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param delay Delay in ticks
*/
void setShieldBlockingDelay(int delay);