OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 07:48:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update B/CB

Browse source
This commit is contained in:
Shane Freeder 2018-05-08 23:09:45 +01:00
parent bd0335acaa
commit 8595189ab6
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch
View file

@ -1,14 +1,14 @@
From a3cf6f6205e8985b4c575a6028c5a4bbb5ca5ba7 Mon Sep 17 00:00:00 2001 From 4c38a0b7c20bd533e8ca2f93edd4e1657aba85fe Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Fri, 4 Mar 2016 03:13:18 -0500 Date: Fri, 4 Mar 2016 03:13:18 -0500
Subject: [PATCH] Arrow pickup rule API Subject: [PATCH] Arrow pickup rule API
diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
index 5850ab6c..a8d1826a 100644 index 99814eee..34dde443 100644
--- a/src/main/java/org/bukkit/entity/Arrow.java --- a/src/main/java/org/bukkit/entity/Arrow.java
+++ b/src/main/java/org/bukkit/entity/Arrow.java +++ b/src/main/java/org/bukkit/entity/Arrow.java
@@ -90,4 +90,38 @@ public interface Arrow extends Projectile { @@ -108,4 +108,38 @@ public interface Arrow extends Projectile {
@Override @Override
Spigot spigot(); Spigot spigot();
// Spigot end // Spigot end
@ -48,5 +48,5 @@ index 5850ab6c..a8d1826a 100644
+ // Paper end + // Paper end
} }
-- --
2.13.2 2.17.0

2
work/Bukkit

@ -1 +1 @@
Subproject commit 33a62b95913e6df50dc60f0fdad3144ba094bef7 Subproject commit 222f7d167f7af6b4a96a320c0d69279c929ab17d

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 1988d7f1045b302b5b58d2018a4d1e27a4dbd8fd Subproject commit d0a3620c2dc8a22438808f395348c100a183a618