Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
19ff55ef Update upstream B/CB
79710332 Update upstream CB
19de9af6 1.15.2 update (#2887)
d4ae43fc Updated Upstream (Bukkit/CraftBukkit)
9c2d9a5f [CI-SKIP] Rebuild patches
86a4b752 Fix items not falling correctly (Resolves #2835) (#2872)
35472de2 Port activation range improvement patch (#2763)
617f6033 Add effect to block break naturally (#2819)
f63cfe00 Updated Upstream (Bukkit/CraftBukkit)
00860e4e [CI-SKIP] rebuild patches
3d519668 Prevent sync chunk loads when villagers try to find beds (#2855)
This commit is contained in:
William Blake Galbreath
2020-01-21 22:17:22 -06:00
parent ab2c6c147e
commit 8ad9357437
38 changed files with 466 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0027-Remove-pointless-annotations-and-deprecations.patch
View File

@@ -1,4 +1,4 @@
From 804e28a389aed21f58adc8deddd1b22252d99dbd Mon Sep 17 00:00:00 2001
From f9315e180c14b58252a214df391a8aebe9e7d13e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 31 Dec 2019 23:00:07 -0600
Subject: [PATCH] Remove pointless annotations and deprecations
@@ -72,10 +72,10 @@ index e9cf71f5c..34d3462c7 100644
+ public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args); // Purpur - remove pointless annotations
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 495161f62..4b8661bb3 100644
index 5426e7c2f..cc324fe23 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -186,13 +186,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -204,13 +204,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
* Sets the durability of this item
*
* @param durability Durability of this item
@@ -89,7 +89,7 @@ index 495161f62..4b8661bb3 100644
public void setDurability(final short durability) {
ItemMeta meta = getItemMeta();
if (meta != null) {
@@ -205,9 +199,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -223,9 +217,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
* Gets the durability of this item
*
* @return Durability of this item