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

Updated Upstream (Paper & Pufferfish)

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

Paper Changes:
PaperMC/Paper@e552beb Fix inventory desync (#9640)
PaperMC/Paper@6f30f08 Readd old BlockDamageEvent constructor
PaperMC/Paper@6813244 Fix/improve destroy speed API (#9645)
PaperMC/Paper@7d13b70 Add titleOverride to InventoryOpenEvent (#7540)
PaperMC/Paper@0e622c7 Add sniffer egg api (#9288)
PaperMC/Paper@0c0a480 Do crystal-portal proximity check before entity lookup (#9611)

Pufferfish Changes:
pufferfish-gg/Pufferfish@30537a0 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@af1f56c Updated Upstream (Paper)
pufferfish-gg/Pufferfish@f6a081a Updated Upstream (Paper)
pufferfish-gg/Pufferfish@e148cd6 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@2611af8 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@68f7501 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@38b9f2e Updated Upstream (Paper)
pufferfish-gg/Pufferfish@2bc9d45 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@a3c0a4d Updated Upstream (Paper)
This commit is contained in:
granny
2023-08-26 22:05:21 -07:00
parent 8ef1580b1f
commit 4240de4a38
14 changed files with 59 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0307-place-end-crystal-on-any-block.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] place end crystal on any block
diff --git a/src/main/java/net/minecraft/world/item/EndCrystalItem.java b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
index dc695c518beed770e787d61bcda7e1cd28bc43eb..528f836dfc220dc4b929c321dafc6a78b54d899b 100644
index 3688e9f8c6c6d1239095e3a87060ccca90386d0c..34254eec36d34ae343733fa1abbaaba60be41a3b 100644
--- a/src/main/java/net/minecraft/world/item/EndCrystalItem.java
+++ b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
@@ -26,7 +26,7 @@ public class EndCrystalItem extends Item {
@@ -16,7 +16,7 @@ index dc695c518beed770e787d61bcda7e1cd28bc43eb..528f836dfc220dc4b929c321dafc6a78
+ if (!world.purpurConfig.endCrystalPlaceAnywhere && !iblockdata.is(Blocks.OBSIDIAN) && !iblockdata.is(Blocks.BEDROCK)) {
return InteractionResult.FAIL;
} else {
BlockPos blockposition1 = blockposition.above();
BlockPos blockposition1 = blockposition.above(); final BlockPos aboveBlockPosition = blockposition1; // Paper - OBFHELPER
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ec6c29638935835d590823c5cc35141a7f4d32f2..078102e636803f38facc049952813ff2f8b63594 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java