Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17: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:
b75eeca0 Boost light task priority to ensure it doesnt hold up chunk loads
3d2bc848 Ensure VillagerTrades doesn't load async - fixes #3495
e470f1ef Add more information to Timing Reports
f4a47db6 Improve Thread Pool usage to allow single threads for single cpu servers
a4fe910f Fix sounds when using worldedit regen command
70ad51a8 Updated Upstream (Bukkit/CraftBukkit)
d7cfa4fa Improve legacy format serialization more
This commit is contained in:
William Blake Galbreath
2020-06-05 21:41:54 -05:00
parent c2c6a6efd9
commit c0c212bf48
161 changed files with 754 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
patches/server/0074-Expose-getItemStack-for-Trident.patch Normal file
View File

@@ -0,0 +1,42 @@
From 1aa60ccb54ba04884e1d3f0a1f911049e79be5eb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 18 Oct 2019 22:19:40 -0500
Subject: [PATCH] Expose getItemStack for Trident
---
.../java/net/minecraft/server/EntityThrownTrident.java | 2 +-
.../java/org/bukkit/craftbukkit/entity/CraftTrident.java | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java
index 59bb039ad7..ed8e26aa45 100644
--- a/src/main/java/net/minecraft/server/EntityThrownTrident.java
+++ b/src/main/java/net/minecraft/server/EntityThrownTrident.java
@@ -77,7 +77,7 @@ public class EntityThrownTrident extends EntityArrow {
}
@Override
- protected ItemStack getItemStack() {
+ public ItemStack getItemStack() { // Purpur - protected -> public
return this.trident.cloneItemStack();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
index 0518e6c683..63287a9b65 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
@@ -25,4 +25,11 @@ public class CraftTrident extends CraftArrow implements Trident {
public EntityType getType() {
return EntityType.TRIDENT;
}
+
+ // Purpur start
+ @Override
+ public org.bukkit.inventory.ItemStack getItemStack() {
+ return org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(getHandle().getItemStack());
+ }
+ // Purpur end
}
--
2.24.0