Skip to content

Commit 3a2b951

Browse files
committed
Fix non tnt entities breaking durable blocks config capitalisation
1 parent 0fe3ebd commit 3a2b951

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

patches/server/0004-Sakura-Configuration-Files.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ index 0000000000000000000000000000000000000000..5fc23a0b579d7cbe03baf5324bef887a
608608
+}
609609
diff --git a/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java b/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java
610610
new file mode 100644
611-
index 0000000000000000000000000000000000000000..72c7febee011d0d3aaec4da49c40eeccbcd47bc0
611+
index 0000000000000000000000000000000000000000..0a06172054ef1df798b8ba866fffb0da3a3f9fbe
612612
--- /dev/null
613613
+++ b/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java
614614
@@ -0,0 +1,151 @@
@@ -692,7 +692,7 @@ index 0000000000000000000000000000000000000000..72c7febee011d0d3aaec4da49c40eecc
692692
+ map.put(Blocks.CHIPPED_ANVIL, new DurableMaterial(3, Blocks.END_STONE.getExplosionResistance()));
693693
+ map.put(Blocks.DAMAGED_ANVIL, new DurableMaterial(3, Blocks.END_STONE.getExplosionResistance()));
694694
+ });
695-
+ public boolean allowNonTNTBreakingDurableBlocks = false;
695+
+ public boolean allowNonTntBreakingDurableBlocks = false;
696696
+ public boolean destroyWaterloggedBlocks = false;
697697
+ public boolean explodeLava = false;
698698
+ public boolean consistentRadius = false;

patches/server/0030-Explosion-Durable-Blocks.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ index a8008c7550488be34b51f4280f5569170b1ebd1d..b10cfec6da6dfab89e585c5d4d39ae04
124124
public String getDescriptionId() {
125125
return this.getOrCreateDescriptionId();
126126
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
127-
index 11ce5591f5f7eb487323e2c828218af2461fca09..6d80a68b744fdba2cff436b3b0c5f9db7e283be3 100644
127+
index 11ce5591f5f7eb487323e2c828218af2461fca09..810bbc05dcfaf0e55804ebb86e89f628ad02e478 100644
128128
--- a/src/main/java/net/minecraft/world/level/Explosion.java
129129
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
130130
@@ -198,6 +198,17 @@ public class Explosion {
@@ -136,7 +136,7 @@ index 11ce5591f5f7eb487323e2c828218af2461fca09..6d80a68b744fdba2cff436b3b0c5f9db
136136
+ Block block = blockState.getBlock();
137137
+ me.samsuik.sakura.explosion.durable.DurableMaterial material = this.level.localConfig().config(pos).durableMaterials.get(block);
138138
+
139-
+ if (material != null && material.resistance() >= 0.0f && (this.level.sakuraConfig().cannons.explosion.allowNonTNTBreakingDurableBlocks || this.source instanceof net.minecraft.world.entity.item.PrimedTnt)) {
139+
+ if (material != null && material.resistance() >= 0.0f && (this.level.sakuraConfig().cannons.explosion.allowNonTntBreakingDurableBlocks || this.source instanceof net.minecraft.world.entity.item.PrimedTnt)) {
140140
+ resistance = Optional.of(material.resistance());
141141
+ }
142142
+ }
@@ -150,7 +150,7 @@ index 11ce5591f5f7eb487323e2c828218af2461fca09..6d80a68b744fdba2cff436b3b0c5f9db
150150
BlockState iblockdata = this.level.getBlockState(blockposition);
151151
Block block = iblockdata.getBlock();
152152
+ // Sakura start - durable materials
153-
+ if (level.sakuraConfig().cannons.explosion.allowNonTNTBreakingDurableBlocks || source instanceof net.minecraft.world.entity.item.PrimedTnt) {
153+
+ if (level.sakuraConfig().cannons.explosion.allowNonTntBreakingDurableBlocks || source instanceof net.minecraft.world.entity.item.PrimedTnt) {
154154
+ me.samsuik.sakura.explosion.durable.DurableMaterial material = level.localConfig().config(blockposition).durableMaterials.get(block);
155155
+
156156
+ if (material != null && material.durability() >= 0 && !level.durabilityManager.damage(blockposition, material)) {

patches/server/0044-Allow-explosions-to-destroy-lava.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ Subject: [PATCH] Allow explosions to destroy lava
55

66

77
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
8-
index 1a7697b3d3755edd4b5c066154e8606fac64cc21..9a12494609df9fad98c71806e192d0ed26706582 100644
8+
index c94e2bf305437b88f82dbb8ab105cfbf5dec01f8..f1b260cc62e6c955ad2fa72c779afc3d84b92e6b 100644
99
--- a/src/main/java/net/minecraft/world/level/Explosion.java
1010
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
1111
@@ -214,6 +214,10 @@ public class Explosion {
12-
if (material != null && material.resistance() >= 0.0f && (this.level.sakuraConfig().cannons.explosion.allowNonTNTBreakingDurableBlocks || this.source instanceof net.minecraft.world.entity.item.PrimedTnt)) {
12+
if (material != null && material.resistance() >= 0.0f && (this.level.sakuraConfig().cannons.explosion.allowNonTntBreakingDurableBlocks || this.source instanceof net.minecraft.world.entity.item.PrimedTnt)) {
1313
resistance = Optional.of(material.resistance());
1414
}
1515
+

0 commit comments

Comments
 (0)