mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
028d47bf9f
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@990be16 Iterate over entity array copy for entity scheduler PaperMC/Paper@3f6c4b0 Add event for player editing sign (#9300) PaperMC/Paper@7103f81 Only tick item frames if players can see it (#9377) PaperMC/Paper@cf0f013 Avoid duplicate death event call for armorstands (#9223) PaperMC/Paper@8582999 Deprecate duplicate chat completion methods (#9401) PaperMC/Paper@e4b40dd Fix entity selectors while spectating (#9402) PaperMC/Paper@82cd69f [ci skip] Update Repo style and change project url in README (#9407) PaperMC/Paper@2c9c5e4 Fix replenishable container entities save/load existing contents (#9417) PaperMC/Paper@437e8da Improve command function perm level checks (#9411) PaperMC/Paper@225c950 Hotfix double entity removal making entity scheduler retire call PaperMC/Paper@fead63e Add option to disable NoteBlock and Tripwire updates (#9368) Pufferfish Changes: pufferfish-gg/Pufferfish@50f3124 Updated Upstream (Paper) pufferfish-gg/Pufferfish@5673490 Add option to suppress null ID disconnections in logs pufferfish-gg/Pufferfish@1e911fb Fix issue with that last patch
70 lines
3.7 KiB
Diff
70 lines
3.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MelnCat <melncatuwu@gmail.com>
|
|
Date: Sat, 1 Oct 2022 13:29:17 -0700
|
|
Subject: [PATCH] Configurable block blast resistance
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
|
|
index 5ac102afde62c08f36886b466010ccfedabfa05e..942ce713afe27ec75d849877a88721ef6334fafa 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
|
|
@@ -81,7 +81,7 @@ public abstract class BlockBehaviour implements FeatureElement {
|
|
|
|
protected static final Direction[] UPDATE_SHAPE_ORDER = new Direction[]{Direction.WEST, Direction.EAST, Direction.NORTH, Direction.SOUTH, Direction.DOWN, Direction.UP};
|
|
public final boolean hasCollision;
|
|
- protected final float explosionResistance;
|
|
+ public float explosionResistance; // Purpur - protected final -> public
|
|
protected final boolean isRandomlyTicking;
|
|
protected final SoundType soundType;
|
|
protected final float friction;
|
|
diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
|
|
index b77cdbd8a7395e8442081c6a2b14695d62c9ef03..f3d4a4196847e26934b6d2ed592f0ddb0e53182b 100644
|
|
--- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java
|
|
+++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
|
|
@@ -239,7 +239,7 @@ public abstract class LavaFluid extends FlowingFluid {
|
|
|
|
@Override
|
|
protected float getExplosionResistance() {
|
|
- return 100.0F;
|
|
+ return Blocks.LAVA.getExplosionResistance(); // Purpur
|
|
}
|
|
|
|
@Override
|
|
diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
|
|
index ec6c63075306f9e5389e83641d2c8a82369ddc6b..0f16deddd8cbb506ef7886f57ae640a42e841703 100644
|
|
--- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java
|
|
+++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
|
|
@@ -116,7 +116,7 @@ public abstract class WaterFluid extends FlowingFluid {
|
|
|
|
@Override
|
|
protected float getExplosionResistance() {
|
|
- return 100.0F;
|
|
+ return Blocks.WATER.getExplosionResistance(); // Purpur
|
|
}
|
|
|
|
@Override
|
|
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
|
index 736768330a0c45051a20a039d4de35cb260e7611..a3ffc1b8bd8f471c088d1d8256d67a6e2048b065 100644
|
|
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
|
@@ -557,4 +557,19 @@ public class PurpurConfig {
|
|
private static void fixProjectileLootingTransfer() {
|
|
fixProjectileLootingTransfer = getBoolean("settings.fix-projectile-looting-transfer", fixProjectileLootingTransfer);
|
|
}
|
|
+
|
|
+ private static void blastResistanceSettings() {
|
|
+ getMap("settings.blast-resistance-overrides", Collections.emptyMap()).forEach((blockId, value) -> {
|
|
+ Block block = BuiltInRegistries.BLOCK.get(new ResourceLocation(blockId));
|
|
+ if (block == Blocks.AIR) {
|
|
+ log(Level.SEVERE, "Invalid block for `settings.blast-resistance-overrides`: " + blockId);
|
|
+ return;
|
|
+ }
|
|
+ if (!(value instanceof Number blastResistance)) {
|
|
+ log(Level.SEVERE, "Invalid blast resistance for `settings.blast-resistance-overrides." + blockId + "`: " + value);
|
|
+ return;
|
|
+ }
|
|
+ block.explosionResistance = blastResistance.floatValue();
|
|
+ });
|
|
+ }
|
|
}
|