mirror of
https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git
synced 2024-11-22 10:06:16 +00:00
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
--- a/net/minecraft/world/level/block/BlockRedstoneLamp.java
|
|
+++ b/net/minecraft/world/level/block/BlockRedstoneLamp.java
|
|
@@ -13,6 +13,8 @@
|
|
import net.minecraft.world.level.block.state.properties.BlockStateBoolean;
|
|
import net.minecraft.world.level.redstone.Orientation;
|
|
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
|
|
+
|
|
public class BlockRedstoneLamp extends Block {
|
|
|
|
public static final MapCodec<BlockRedstoneLamp> CODEC = simpleCodec(BlockRedstoneLamp::new);
|
|
@@ -43,6 +45,11 @@
|
|
if (flag1) {
|
|
world.scheduleTick(blockposition, (Block) this, 4);
|
|
} else {
|
|
+ // CraftBukkit start
|
|
+ if (CraftEventFactory.callRedstoneChange(world, blockposition, 0, 15).getNewCurrent() != 15) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
world.setBlock(blockposition, (IBlockData) iblockdata.cycle(BlockRedstoneLamp.LIT), 2);
|
|
}
|
|
}
|
|
@@ -53,6 +60,11 @@
|
|
@Override
|
|
protected void tick(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, RandomSource randomsource) {
|
|
if ((Boolean) iblockdata.getValue(BlockRedstoneLamp.LIT) && !worldserver.hasNeighborSignal(blockposition)) {
|
|
+ // CraftBukkit start
|
|
+ if (CraftEventFactory.callRedstoneChange(worldserver, blockposition, 15, 0).getNewCurrent() != 0) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
worldserver.setBlock(blockposition, (IBlockData) iblockdata.cycle(BlockRedstoneLamp.LIT), 2);
|
|
}
|
|
|