OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 15:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

[CI-SKIP] [Auto] Rebuild Patches

Browse source 
A recent commit has been made that caused patches to be out of order, rebuilding
This commit is contained in:
Aikar 2020-11-11 12:46:51 -05:00
parent becb478cd5
commit 5b123cd1d5
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
6 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Spigot-API-Patches/0232-Item-no-age-no-player-pickup.patch → Spigot-API-Patches/0233-Item-no-age-no-player-pickup.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Item no age & no player pickup
diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
index c404a5b8efea7c780db5ddae19456753808abb3d..5acbe1504fcdb93540acde0dcb00a9a6362dfc1e 100644
index c404a5b8efea7c780db5ddae19456753808abb3d..0ee072645ecf1bf5feb74de6960947ef76db366e 100644
--- a/src/main/java/org/bukkit/entity/Item.java
+++ b/src/main/java/org/bukkit/entity/Item.java
@@ -90,5 +90,34 @@ public interface Item extends Entity {

0
Spigot-API-Patches/0233-Beacon-API-custom-effect-ranges.patch → Spigot-API-Patches/0234-Beacon-API-custom-effect-ranges.patch
View file

0
Spigot-Server-Patches/0594-Toggle-for-removing-existing-dragon.patch → Spigot-Server-Patches/0595-Toggle-for-removing-existing-dragon.patch
View file

4
Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch → Spigot-Server-Patches/0596-Fix-client-lag-on-advancement-loading.patch
View file

@ -15,7 +15,7 @@ manually reload the advancement data for all players, which
normally takes place as a part of the datapack reloading.
diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
index 17789407b9e86896a963a305a13357286aa5f319..ddbf8237d598f32e6e5361ca92ace268dfbec906 100644
index 17789407b9e86896a963a305a13357286aa5f319..c680319e4040be2b60795b22a5e65d6444cc67ed 100644
--- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
+++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
@@ -78,6 +78,7 @@ public class AdvancementDataPlayer {
@ -35,7 +35,7 @@ index 17789407b9e86896a963a305a13357286aa5f319..ddbf8237d598f32e6e5361ca92ace268
if (this.m || !this.i.isEmpty() || !this.j.isEmpty()) {
Map<MinecraftKey, AdvancementProgress> map = Maps.newHashMap();
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 3ebaa9463e365831de37d8fa3cc191693f5b856f..9957c65d418f39e74956d1182b8fbf539f404eb6 100644
index ed926fc6ebbabd50a73d216a9e018a9427f5b128..0f7f1503d07bdff7ce7644dfe21e444adb52c7db 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -282,7 +282,13 @@ public final class CraftMagicNumbers implements UnsafeValues {

0
Spigot-Server-Patches/0596-Item-no-age-no-player-pickup.patch → Spigot-Server-Patches/0597-Item-no-age-no-player-pickup.patch
View file

0
Spigot-Server-Patches/0597-Beacon-API-custom-effect-ranges.patch → Spigot-Server-Patches/0598-Beacon-API-custom-effect-ranges.patch
View file