diff --git a/patches/server/Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/Call-BlockRedstoneEvents-for-lecterns.patch
deleted file mode 100644
index a48659751..000000000
--- a/patches/server/Call-BlockRedstoneEvents-for-lecterns.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
-Date: Wed, 13 Sep 2023 05:46:10 +0200
-Subject: [PATCH] Call BlockRedstoneEvents for lecterns
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/LecternBlock.java b/src/main/java/net/minecraft/world/level/block/LecternBlock.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/level/block/LecternBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/LecternBlock.java
-@@ -0,0 +0,0 @@ public class LecternBlock extends BaseEntityBlock {
-     }
- 
-     private static void changePowered(Level world, BlockPos pos, BlockState state, boolean powered) {
-+        // Paper start - call BlockRedstoneEvents for lecterns
-+        final int currentRedstoneLevel = state.getValue(LecternBlock.POWERED) ? 15 : 0, targetRedstoneLevel = powered ? 15 : 0;
-+        if (currentRedstoneLevel != targetRedstoneLevel) {
-+            final org.bukkit.event.block.BlockRedstoneEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callRedstoneChange(world, pos, currentRedstoneLevel, targetRedstoneLevel);
-+
-+            if (event.getNewCurrent() != targetRedstoneLevel) {
-+                return;
-+            }
-+        }
-+        // Paper end - call BlockRedstoneEvents for lecterns
-         world.setBlock(pos, (BlockState) state.setValue(LecternBlock.POWERED, powered), 3);
-         LecternBlock.updateBelow(world, pos, state);
-     }
diff --git a/patches/server/Call-BlockRedstoneEvents-properly.patch b/patches/server/Call-BlockRedstoneEvents-properly.patch
new file mode 100644
index 000000000..4378838a4
--- /dev/null
+++ b/patches/server/Call-BlockRedstoneEvents-properly.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
+Date: Wed, 13 Sep 2023 05:46:10 +0200
+Subject: [PATCH] Call BlockRedstoneEvents properly
+
+Call BlockRedstoneEvents for lecterns.
+Fix previous power level for experimental redstone wire.
+
+diff --git a/src/main/java/net/minecraft/world/level/block/LecternBlock.java b/src/main/java/net/minecraft/world/level/block/LecternBlock.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/block/LecternBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/LecternBlock.java
+@@ -0,0 +0,0 @@ public class LecternBlock extends BaseEntityBlock {
+     }
+ 
+     private static void changePowered(Level world, BlockPos pos, BlockState state, boolean powered) {
++        // Paper start - Call BlockRedstoneEvent properly
++        final int currentRedstoneLevel = state.getValue(LecternBlock.POWERED) ? 15 : 0, targetRedstoneLevel = powered ? 15 : 0;
++        if (currentRedstoneLevel != targetRedstoneLevel) {
++            final org.bukkit.event.block.BlockRedstoneEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callRedstoneChange(world, pos, currentRedstoneLevel, targetRedstoneLevel);
++
++            if (event.getNewCurrent() != targetRedstoneLevel) {
++                return;
++            }
++        }
++        // Paper end - Call BlockRedstoneEvent properly
+         world.setBlock(pos, (BlockState) state.setValue(LecternBlock.POWERED, powered), 3);
+         LecternBlock.updateBelow(world, pos, state);
+     }
+diff --git a/src/main/java/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.java b/src/main/java/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.java
++++ b/src/main/java/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.java
+@@ -0,0 +0,0 @@ public class ExperimentalRedstoneWireEvaluator extends RedstoneWireEvaluator {
+             BlockState iblockdata1 = world.getBlockState(blockposition1);
+ 
+             // CraftBukkit start
+-            int oldPower = state.getValue(RedStoneWireBlock.POWER);
++            int oldPower = iblockdata1.getValue(RedStoneWireBlock.POWER); // Paper - Call BlockRedstoneEvent properly; get the previous power from the right state
+             if (oldPower != j) {
+                 BlockRedstoneEvent event = new BlockRedstoneEvent(CraftBlock.at(world, blockposition1), oldPower, j);
+                 world.getCraftServer().getPluginManager().callEvent(event);