From 039d616af2fa95c55c13a6e4489eb301087c9783 Mon Sep 17 00:00:00 2001
From: jhqwqmc <2110242767@qq.com>
Date: Sun, 7 Sep 2025 08:44:24 +0800
Subject: [PATCH] =?UTF-8?q?refactor(bukkit):=20=E7=A7=BB=E9=99=A4=20LampBl?=
 =?UTF-8?q?ockBehavior=20=E4=B8=AD=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=20p?=
 =?UTF-8?q?owered=20=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bukkit/block/behavior/LampBlockBehavior.java   | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/LampBlockBehavior.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/LampBlockBehavior.java
index 55efd700d..cd46e8ff8 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/LampBlockBehavior.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/LampBlockBehavior.java
@@ -22,13 +22,11 @@ import java.util.concurrent.Callable;
 public class LampBlockBehavior extends BukkitBlockBehavior {
     public static final Factory FACTORY = new Factory();
     private final Property<Boolean> litProperty;
-    private final Property<Boolean> poweredProperty;
     private final boolean canOpenWithHand;
 
-    public LampBlockBehavior(CustomBlock block, Property<Boolean> litProperty, Property<Boolean> poweredProperty, boolean canOpenWithHand) {
+    public LampBlockBehavior(CustomBlock block, Property<Boolean> litProperty, boolean canOpenWithHand) {
         super(block);
         this.litProperty = litProperty;
-        this.poweredProperty = poweredProperty;
         this.canOpenWithHand = canOpenWithHand;
     }
 
@@ -42,7 +40,7 @@ public class LampBlockBehavior extends BukkitBlockBehavior {
         FastNMS.INSTANCE.method$LevelWriter$setBlock(
                 context.getLevel().serverWorld(),
                 LocationUtils.toBlockPos(context.getClickedPos()),
-                state.cycle(behavior.litProperty).cycle(behavior.poweredProperty).customBlockState().literalObject(),
+                state.cycle(behavior.litProperty).customBlockState().literalObject(),
                 2
         );
         Optional.ofNullable(context.getPlayer()).ifPresent(p -> p.swingHand(context.getHand()));
@@ -54,7 +52,6 @@ public class LampBlockBehavior extends BukkitBlockBehavior {
         if (this.canOpenWithHand) return state;
         Object level = context.getLevel().serverWorld();
         state = state.with(this.litProperty, FastNMS.INSTANCE.method$SignalGetter$hasNeighborSignal(level, LocationUtils.toBlockPos(context.getClickedPos())));
-        state = state.with(this.poweredProperty, FastNMS.INSTANCE.method$SignalGetter$hasNeighborSignal(level, LocationUtils.toBlockPos(context.getClickedPos())));
         return state;
     }
 
@@ -71,7 +68,7 @@ public class LampBlockBehavior extends BukkitBlockBehavior {
             if (FastNMS.INSTANCE.method$CraftEventFactory$callRedstoneChange(world, blockPos, 0, 15).getNewCurrent() != 15) {
                 return;
             }
-            FastNMS.INSTANCE.method$LevelWriter$setBlock(world, blockPos, customState.cycle(this.litProperty).cycle(this.poweredProperty).customBlockState().literalObject(), 2);
+            FastNMS.INSTANCE.method$LevelWriter$setBlock(world, blockPos, customState.cycle(this.litProperty).customBlockState().literalObject(), 2);
         }
     }
 
@@ -92,7 +89,7 @@ public class LampBlockBehavior extends BukkitBlockBehavior {
                 if (FastNMS.INSTANCE.method$CraftEventFactory$callRedstoneChange(world, blockPos, 0, 15).getNewCurrent() != 15) {
                     return;
                 }
-                FastNMS.INSTANCE.method$LevelWriter$setBlock(world, blockPos, customState.cycle(this.litProperty).cycle(this.poweredProperty).customBlockState().literalObject(), 2);
+                FastNMS.INSTANCE.method$LevelWriter$setBlock(world, blockPos, customState.cycle(this.litProperty).customBlockState().literalObject(), 2);
             }
         }
     }
@@ -102,9 +99,8 @@ public class LampBlockBehavior extends BukkitBlockBehavior {
         @Override
         public BlockBehavior create(CustomBlock block, Map<String, Object> arguments) {
             Property<Boolean> lit = (Property<Boolean>) ResourceConfigUtils.requireNonNullOrThrow(block.getProperty("lit"), "warning.config.block.behavior.lamp.missing_lit");
-            Property<Boolean> powered = (Property<Boolean>) ResourceConfigUtils.requireNonNullOrThrow(block.getProperty("powered"), "warning.config.block.behavior.lamp.missing_powered");
             boolean canOpenWithHand = ResourceConfigUtils.getAsBoolean(arguments.getOrDefault("can-open-with-hand", false), "can-open-with-hand");
-            return new LampBlockBehavior(block, lit, powered, canOpenWithHand);
+            return new LampBlockBehavior(block, lit, canOpenWithHand);
         }
     }
 }