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

Renumber patches, fix conflicts, update for 1.12

Browse source
This commit is contained in:
Zach Brown 2017-06-11 20:02:57 -05:00
parent d6358a6ac1
commit cb887bb4f4
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
8 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Spigot-API-Patches/0051-Item-canEntityPickup.patch → Spigot-API-Patches/0053-Item-canEntityPickup.patch
View file

@ -1,11 +1,11 @@
From e704dc9588b52864b7a812d19cb31db68e34a155 Mon Sep 17 00:00:00 2001
From 8e5a65fb5168e3a6f655fb0e99b3ca98b7e73860 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 5 May 2017 03:57:08 -0500
Subject: [PATCH] Item#canEntityPickup
diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
index 90260b7e..7163f8b0 100644
index 90260b7e..2e98e4f9 100644
--- a/src/main/java/org/bukkit/entity/Item.java
+++ b/src/main/java/org/bukkit/entity/Item.java
@@ -34,4 +34,20 @@ public interface Item extends Entity {
@ -30,5 +30,5 @@ index 90260b7e..7163f8b0 100644
+ // Paper end
}
--
2.11.0
2.13.1

8
Spigot-API-Patches/0051-PlayerPickupItemEvent-setFlyAtPlayer.patch → Spigot-API-Patches/0054-PlayerPickupItemEvent-setFlyAtPlayer.patch
View file

@ -1,11 +1,11 @@
From 1c5d13ab2ee4ed3b4014df257470cf39889789e5 Mon Sep 17 00:00:00 2001
From 447ed7747e09f6b38ea1119083b95c47c55e1bab Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 May 2017 06:26:01 -0500
Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
index dfba8163..fd97ea21 100644
index dfba8163..83ee01f7 100644
--- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
@@ -11,6 +11,7 @@ import org.bukkit.event.HandlerList;
@ -16,7 +16,7 @@ index dfba8163..fd97ea21 100644
private boolean cancel = false;
private final int remaining;
@@ -38,12 +39,35 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
@@ -38,12 +39,34 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
return remaining;
}
@ -52,5 +52,5 @@ index dfba8163..fd97ea21 100644
@Override
--
2.11.0
2.13.1

4
Spigot-API-Patches/0051-PlayerAttemptPickupItemEvent.patch → Spigot-API-Patches/0055-PlayerAttemptPickupItemEvent.patch
View file

@ -1,4 +1,4 @@
From a631841be7233f73e601e109bbfdcc5a57e8ae6b Mon Sep 17 00:00:00 2001
From 22f105de2d79c874e1c620563073bbda1a78c97a Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 11 Jun 2017 16:30:37 -0500
Subject: [PATCH] PlayerAttemptPickupItemEvent
@ -47,5 +47,5 @@ index 00000000..2f5fdb13
+ }
+}
--
2.11.0
2.13.1

8
Spigot-API-Patches/0051-EntityPickupItemEvent.patch → Spigot-API-Patches/0056-EntityPickupItemEvent.patch
View file

@ -1,4 +1,4 @@
From a22f01307daf61a282adc1665cffc08e47871490 Mon Sep 17 00:00:00 2001
From 92a2a2f1b72749139bbbb785746b546a3741474f Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 5 May 2017 01:16:10 -0500
Subject: [PATCH] EntityPickupItemEvent
@ -6,10 +6,10 @@ Subject: [PATCH] EntityPickupItemEvent
diff --git a/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java b/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java
new file mode 100644
index 00000000..f485f313
index 00000000..3d40b515
--- /dev/null
+++ b/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java
@@ -0,0 +1,46 @@
@@ -0,0 +1,48 @@
+package org.bukkit.event.entity;
+
+import org.bukkit.entity.Item;
@ -59,5 +59,5 @@ index 00000000..f485f313
+ }
+}
--
2.11.0
2.13.1