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

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@a736c1a Add new overload to PersistentDataContainer#has (#7278)
PaperMC/Paper@2be9beb Add material tags for deepslate ores (#7174)
PaperMC/Paper@87d8ef9 Add/Remove multiple entries with Scoreboard Team (#6640)
PaperMC/Paper@3ea224d Reset placed blocks on exceptions
This commit is contained in:
BillyGalbreath
2022-01-10 07:17:02 -06:00
parent e85e5ebc2e
commit 5381fe7cf9
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -4,7 +4,7 @@ version = 1.18.1-R0.1-SNAPSHOT
mcVersion = 1.18.1 mcVersion = 1.18.1
packageVersion = 1_18_R1 packageVersion = 1_18_R1
paperCommit = 7d7ae7b8817077603758d4f78e275f5cc2052337 paperCommit = 3ea224d12801e2ad31034922ac4bc31557be65d2
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

4
patches/server/0209-option-to-disable-shulker-box-items-from-dropping-co.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] option to disable shulker box items from dropping contents
diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
index 8175bb6331727440da2232998bdad068a1c47ae8..be47543240bd573cd2cc08f84b7eab1c693438ec 100644 index 893d5bf448ddbccb30db0ee751c7f4a4e83634b9..b7a7d9ef5f7c8fecb5625a98471314b6f5fc9a42 100644
--- a/src/main/java/net/minecraft/world/item/BlockItem.java --- a/src/main/java/net/minecraft/world/item/BlockItem.java
+++ b/src/main/java/net/minecraft/world/item/BlockItem.java +++ b/src/main/java/net/minecraft/world/item/BlockItem.java
@@ -280,7 +280,7 @@ public class BlockItem extends Item { @@ -293,7 +293,7 @@ public class BlockItem extends Item {
@Override @Override
public void onDestroyed(ItemEntity entity) { public void onDestroyed(ItemEntity entity) {

4
patches/server/0241-Persistent-BlockEntity-Lore-and-DisplayName.patch
View File

@@ -7,10 +7,10 @@ Makes it so that when a BlockEntity is placed in the world and then broken,
the dropped ItemStack retains any original custom display name/lore. the dropped ItemStack retains any original custom display name/lore.
diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
index be47543240bd573cd2cc08f84b7eab1c693438ec..6b0131cccf1a38bc449dd79df8e79a43e96d0bf1 100644 index b7a7d9ef5f7c8fecb5625a98471314b6f5fc9a42..326c3b9e2ee25dded8f0f3878be78b23d5ec11d0 100644
--- a/src/main/java/net/minecraft/world/item/BlockItem.java --- a/src/main/java/net/minecraft/world/item/BlockItem.java
+++ b/src/main/java/net/minecraft/world/item/BlockItem.java +++ b/src/main/java/net/minecraft/world/item/BlockItem.java
@@ -137,7 +137,24 @@ public class BlockItem extends Item { @@ -150,7 +150,24 @@ public class BlockItem extends Item {
} }
protected boolean updateCustomBlockEntityTag(BlockPos pos, Level world, @Nullable Player player, ItemStack stack, BlockState state) { protected boolean updateCustomBlockEntityTag(BlockPos pos, Level world, @Nullable Player player, ItemStack stack, BlockState state) {