2021-10-01 13:07:59 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Mon, 13 Sep 2021 18:55:45 -0700
|
|
|
|
Subject: [PATCH] prevent unintended light block manipulation
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/LightBlock.java b/src/main/java/net/minecraft/world/level/block/LightBlock.java
|
2023-09-22 19:59:56 +02:00
|
|
|
index 6427302f53336fe035882d0a09e3e2d2d929d3b7..6eec44c484763f877aece6d9676ffc166bc10395 100644
|
2021-10-01 13:07:59 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/block/LightBlock.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/block/LightBlock.java
|
|
|
|
@@ -46,6 +46,7 @@ public class LightBlock extends Block implements SimpleWaterloggedBlock {
|
|
|
|
@Override
|
|
|
|
public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
|
2022-12-07 22:05:01 +01:00
|
|
|
if (!world.isClientSide && player.canUseGameMasterBlocks()) {
|
2021-10-01 13:07:59 +02:00
|
|
|
+ if (player.getItemInHand(hand).getItem() != Items.LIGHT || !player.mayInteract(world, pos) || !player.mayUseItemAt(pos, hit.getDirection(), player.getItemInHand(hand))) { return InteractionResult.FAIL; } // Paper
|
|
|
|
world.setBlock(pos, state.cycle(LEVEL), 2);
|
|
|
|
return InteractionResult.SUCCESS;
|
|
|
|
} else {
|