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
|
2024-10-25 12:30:19 +02:00
|
|
|
index 6c3ca57a29d3c5ad1add1cf2f707b930dfc422ea..606c9b03cc69031faed33f437ca254f12224bb62 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
|
2024-10-25 12:30:19 +02:00
|
|
|
@@ -5,7 +5,9 @@ import java.util.function.ToIntFunction;
|
|
|
|
import net.minecraft.core.BlockPos;
|
|
|
|
import net.minecraft.core.Direction;
|
|
|
|
import net.minecraft.core.component.DataComponents;
|
|
|
|
+import net.minecraft.server.level.ServerLevel;
|
|
|
|
import net.minecraft.util.RandomSource;
|
|
|
|
+import net.minecraft.world.InteractionHand;
|
|
|
|
import net.minecraft.world.InteractionResult;
|
|
|
|
import net.minecraft.world.entity.player.Player;
|
|
|
|
import net.minecraft.world.item.ItemStack;
|
|
|
|
@@ -50,6 +52,14 @@ public class LightBlock extends Block implements SimpleWaterloggedBlock {
|
2024-04-26 06:27:19 +02:00
|
|
|
builder.add(LEVEL, WATERLOGGED);
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - prevent unintended light block manipulation
|
|
|
|
+ @Override
|
2024-10-25 12:30:19 +02:00
|
|
|
+ protected InteractionResult useItemOn(ItemStack stack, BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
|
|
|
|
+ if (player.getItemInHand(hand).getItem() != Items.LIGHT || (world instanceof final ServerLevel serverLevel && !player.mayInteract(serverLevel, pos)) || !player.mayUseItemAt(pos, hit.getDirection(), player.getItemInHand(hand))) { return net.minecraft.world.InteractionResult.PASS; } // Paper - Prevent unintended light block manipulation
|
2024-04-26 06:27:19 +02:00
|
|
|
+ return super.useItemOn(stack, state, world, pos, player, hand, hit);
|
|
|
|
+ }
|
|
|
|
+ // Paper end - prevent unintended light block manipulation
|
|
|
|
+
|
2021-10-01 13:07:59 +02:00
|
|
|
@Override
|
2024-04-24 17:27:28 +02:00
|
|
|
protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
|
2022-12-07 22:05:01 +01:00
|
|
|
if (!world.isClientSide && player.canUseGameMasterBlocks()) {
|