Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-03-31 08:55:43 +02:00
Code Issues Projects Releases Wiki Activity

added parameter for Block.Setter in the BlockPlacementRule

Browse Source
This commit is contained in:
Blu 2025-01-16 17:12:07 +01:00
parent b80c799750
commit 15278e4e8a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/minestom/server/instance/InstanceContainer.java
View File

@ -167,7 +167,7 @@ public class InstanceContainer extends Instance {
BlockPlacementRule.PlacementState rulePlacement; BlockPlacementRule.PlacementState rulePlacement;
if (placement instanceof BlockHandler.PlayerPlacement pp) { if (placement instanceof BlockHandler.PlayerPlacement pp) {
rulePlacement = new BlockPlacementRule.PlacementState( rulePlacement = new BlockPlacementRule.PlacementState(
this, block, pp.getBlockFace(), blockPosition, this, this, block, pp.getBlockFace(), blockPosition,
new Vec(pp.getCursorX(), pp.getCursorY(), pp.getCursorZ()), new Vec(pp.getCursorX(), pp.getCursorY(), pp.getCursorZ()),
pp.getPlayer().getPosition(), pp.getPlayer().getPosition(),
pp.getPlayer().getItemInHand(pp.getHand()), pp.getPlayer().getItemInHand(pp.getHand()),
@ -175,7 +175,7 @@ public class InstanceContainer extends Instance {
); );
} else { } else {
rulePlacement = new BlockPlacementRule.PlacementState( rulePlacement = new BlockPlacementRule.PlacementState(
this, block, null, blockPosition, this, this, block, null, blockPosition,
null, null, null, null, null, null,
false false
); );

7
src/main/java/net/minestom/server/instance/block/rule/BlockPlacementRule.java
View File

@ -55,7 +55,8 @@ public abstract class BlockPlacementRule {
} }
public record PlacementState( public record PlacementState(
@NotNull Block.Getter instance, @NotNull Block.Getter blockGetter,
@NotNull Block.Setter blockSetter,
@NotNull Block block, @NotNull Block block,
@Nullable BlockFace blockFace, @Nullable BlockFace blockFace,
@NotNull Point placePosition, @NotNull Point placePosition,
@ -64,6 +65,10 @@ public abstract class BlockPlacementRule {
@Nullable ItemStack usedItemStack, @Nullable ItemStack usedItemStack,
boolean isPlayerShifting boolean isPlayerShifting
) { ) {
@Deprecated
public Block.Getter instance() {
return this.blockGetter;
}
} }
public record UpdateState(@NotNull Block.Getter instance, public record UpdateState(@NotNull Block.Getter instance,