mirror of
https://github.com/PurpurMC/Purpur.git
synced 2025-02-17 13:00:04 +08:00
4240de4a38
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)
40 lines
2.5 KiB
Diff
40 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: granny <contact@granny.dev>
|
|
Date: Wed, 23 Aug 2023 01:39:14 -0700
|
|
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 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 {
|
|
BlockPos blockposition = context.getClickedPos();
|
|
BlockState iblockdata = world.getBlockState(blockposition);
|
|
|
|
- if (!iblockdata.is(Blocks.OBSIDIAN) && !iblockdata.is(Blocks.BEDROCK)) {
|
|
+ if (!world.purpurConfig.endCrystalPlaceAnywhere && !iblockdata.is(Blocks.OBSIDIAN) && !iblockdata.is(Blocks.BEDROCK)) {
|
|
return InteractionResult.FAIL;
|
|
} else {
|
|
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
|
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
@@ -903,6 +903,7 @@ public class PurpurWorldConfig {
|
|
public boolean basedEndCrystalExplosionFire = false;
|
|
public net.minecraft.world.level.Level.ExplosionInteraction basedEndCrystalExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.BLOCK;
|
|
public int endCrystalCramming = 0;
|
|
+ public boolean endCrystalPlaceAnywhere = false;
|
|
private void endCrystalSettings() {
|
|
if (PurpurConfig.version < 31) {
|
|
if ("DESTROY".equals(getString("blocks.end-crystal.baseless.explosion-effect", baselessEndCrystalExplosionEffect.name()))) {
|
|
@@ -931,6 +932,7 @@ public class PurpurWorldConfig {
|
|
basedEndCrystalExplosionEffect = net.minecraft.world.level.Level.ExplosionInteraction.BLOCK;
|
|
}
|
|
endCrystalCramming = getInt("blocks.end-crystal.cramming-amount", endCrystalCramming);
|
|
+ endCrystalPlaceAnywhere = getBoolean("gameplay-mechanics.item.end-crystal.place-anywhere", endCrystalPlaceAnywhere);
|
|
}
|
|
|
|
public boolean farmlandBypassMobGriefing = false;
|