Merge remote-tracking branch 'origin/ver/1.20.4' into ver/1.20.4

Fix non-working tripwire incorrect updating fix
fix CI
2024-04-05 01:19:11 +00:00 · 2024-04-05 01:19:00 +00:00 · 2024-04-04 19:37:52 +08:00 · 2024-04-04 11:29:15 +08:00 · 2024-04-04 11:29:13 +08:00 · 2024-04-04 11:29:11 +08:00
2 changed files with 10 additions and 4 deletions
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ dependencies {
 ## 联系方式
 > 如果您对这个项目感兴趣或有任何问题，请随时向我们提问。

-QQ群：`368632360` | QQ频道：[点击加入](https://pd.qq.com/s/eq9krf9j) | Telegram:[点击加入](https://t.me/LuminolMC)
+QQ群：`368632360`  |  QQ频道：[点击加入](https://pd.qq.com/s/eq9krf9j)  |  Telegram：[点击加入](https://t.me/LuminolMC)

 > [!WARNING]
 > **此项目与Leaves无关。不要向Leaves报告任何有关协议支持的错误，因为协议支持已经重构**
--- a/patches/server/0014-Add-config-for-incorrect-tripwire-updating-fixing.patch
+++ b/patches/server/0014-Add-config-for-incorrect-tripwire-updating-fixing.patch
@@ -31,15 +31,21 @@ index 0000000000000000000000000000000000000000..79ce93a1e97f176c7b0e5b00d7f0880f
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
-index 8bf94fcf5c46ffe6d90f8431338b768ef1a2dd61..a286d6cd2c371c135cb708f2bee9c5afa7532a92 100644
+index 8bf94fcf5c46ffe6d90f8431338b768ef1a2dd61..25e069bd660720232737031fe1630765cce9a1b1 100644
 --- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
-@@ -201,7 +201,7 @@ public class TripWireHookBlock extends Block {
+@@ -201,8 +201,13 @@ public class TripWireHookBlock extends Block {
                     BlockState iblockdata4 = aiblockdata[l];
 
                     if (iblockdata4 != null) {
 -                        if (world.getBlockState(blockposition2).is(Blocks.TRIPWIRE)) { // Paper - Fix tripwire disarming not working as intended
-+                        if (world.getBlockState(blockposition2).is(Blocks.TRIPWIRE) || me.earthme.luminol.config.modules.fixes.IncorrectTripwireFixConfig.enabled) { // Paper - Fix tripwire disarming not working as intended //Luminol - Add config for this
+                        if (me.earthme.luminol.config.modules.fixes.IncorrectTripwireFixConfig.enabled || world.getBlockState(blockposition2).is(Blocks.TRIPWIRE)) { // Paper - Fix tripwire disarming not working as intended //Luminol - Add config for this
                         world.setBlock(blockposition2, (BlockState) iblockdata4.trySetValue(TripWireHookBlock.ATTACHED, flag4), 3);
+                        //Luminol start - Add config for incorrect tripwire updating
+                        if (me.earthme.luminol.config.modules.fixes.IncorrectTripwireFixConfig.enabled){
+                            world.getBlockState(blockposition2).isAir();
+                        }
+                        //Luminol end
                         }
                     }
+                 }
Author	SHA1	Message	Date
MrHua269	a9cd09f900	Merge remote-tracking branch 'origin/ver/1.20.4' into ver/1.20.4	2024-04-05 01:19:11 +00:00
MrHua269	1452008bbe	Fix non-working tripwire incorrect updating fix	2024-04-05 01:19:00 +00:00
Klop233	e71abbd761	fix CI	2024-04-04 19:37:52 +08:00
Klop233	6db86f10e7	Revert "update CI" This reverts commit `e1afa32f90`.	2024-04-04 11:29:15 +08:00
Klop233	f134186657	Revert "Update build_1_20_4.yml" This reverts commit `9551755b0d`.	2024-04-04 11:29:13 +08:00
Klop233	ef1b7ce6f7	Revert "update CI" This reverts commit `3c1be89214`.	2024-04-04 11:29:11 +08:00
Klop233	f16e5c1064	Revert "update CI" This reverts commit `6317a5399b`.	2024-04-04 11:29:08 +08:00
Klop233	0b9a436044	Revert incorrect CI changes This reverts commit `76f2aa58e1`.	2024-04-04 11:28:58 +08:00
Klop233	76f2aa58e1	update CI	2024-04-03 21:35:54 +08:00
Klop233	6317a5399b	update CI	2024-04-03 21:35:54 +08:00
Klop233	3c1be89214	update CI	2024-04-03 21:35:53 +08:00
Klop233	9551755b0d	Update build_1_20_4.yml	2024-04-03 21:35:53 +08:00
Klop233	e1afa32f90	update CI	2024-04-03 21:35:53 +08:00
ShintoKosei	fa109ea506	[ci skip]fix README.md	2024-04-03 18:10:40 +08:00