41 lines
2.4 KiB
Diff
41 lines
2.4 KiB
Diff
--- a/net/minecraft/world/level/block/BlockRedstoneComparator.java
|
|
+++ b/net/minecraft/world/level/block/BlockRedstoneComparator.java
|
|
@@ -27,6 +27,8 @@
|
|
import net.minecraft.world.phys.MovingObjectPositionBlock;
|
|
import net.minecraft.world.ticks.TickListPriority;
|
|
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
|
|
+
|
|
public class BlockRedstoneComparator extends BlockDiodeAbstract implements ITileEntity {
|
|
|
|
public static final BlockStateEnum<BlockPropertyComparatorMode> MODE = BlockProperties.MODE_COMPARATOR;
|
|
@@ -103,7 +105,8 @@
|
|
|
|
@Nullable
|
|
private EntityItemFrame getItemFrame(World world, EnumDirection enumdirection, BlockPosition blockposition) {
|
|
- List<EntityItemFrame> list = world.getEntitiesOfClass(EntityItemFrame.class, new AxisAlignedBB((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), (double) (blockposition.getX() + 1), (double) (blockposition.getY() + 1), (double) (blockposition.getZ() + 1)), (entityitemframe) -> {
|
|
+ // CraftBukkit - decompile error
|
|
+ List<EntityItemFrame> list = world.getEntitiesOfClass(EntityItemFrame.class, new AxisAlignedBB((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), (double) (blockposition.getX() + 1), (double) (blockposition.getY() + 1), (double) (blockposition.getZ() + 1)), (java.util.function.Predicate<EntityItemFrame>) (entityitemframe) -> {
|
|
return entityitemframe != null && entityitemframe.getDirection() == enumdirection;
|
|
});
|
|
|
|
@@ -158,8 +161,18 @@
|
|
boolean flag1 = (Boolean) iblockdata.getValue(BlockRedstoneComparator.POWERED);
|
|
|
|
if (flag1 && !flag) {
|
|
+ // CraftBukkit start
|
|
+ if (CraftEventFactory.callRedstoneChange(world, blockposition, 15, 0).getNewCurrent() != 0) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
world.setBlock(blockposition, (IBlockData) iblockdata.setValue(BlockRedstoneComparator.POWERED, false), 2);
|
|
} else if (!flag1 && flag) {
|
|
+ // CraftBukkit start
|
|
+ if (CraftEventFactory.callRedstoneChange(world, blockposition, 0, 15).getNewCurrent() != 15) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
world.setBlock(blockposition, (IBlockData) iblockdata.setValue(BlockRedstoneComparator.POWERED, true), 2);
|
|
}
|
|
|