Skip to content

Fix/use fake player for all BE's when calling getCloneItemStack() #505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SubordinalBlue wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix/use fake player for all BE's when calling getCloneItemStack() #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3311ccd
For macOS contributors, git should ignore .DS_Store
SubordinalBlue May 28, 2026
457d704
EnergyTransmitter: use fakePlayer in getCloneItemStack call
SubordinalBlue May 28, 2026
e18a135
FulidPlacerT1BE: pass fakePlayer to getCloneItemStack
SubordinalBlue May 29, 2026
3756ce4
SensorT1BE: pass fakePlayer to getCloneItemStack
SubordinalBlue May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@
!/gradlew.bat
!/settings.gradle
!/src/
!/CHANGELOG.md
!/CHANGELOG.md

# macOS kipple
.DS_Store

2 changes: 1 addition & 1 deletion src/main/java/com/direwolf20/justdirethings/common/blockentities/EnergyTransmitterBE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ public void getBlocksToCharge() {
if (!foundAcceptableSide)
return;

ItemStack blockItemStack = blockState.getCloneItemStack(blockPos, level, false, null);
ItemStack blockItemStack = blockState.getCloneItemStack(blockPos, level, false, getUsefulFakePlayer((ServerLevel) level));
if (!isStackValidFilter(blockItemStack)) return;

if (blockState.getBlock() instanceof EnergyTransmitter)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/direwolf20/justdirethings/common/blockentities/FluidPlacerT2BE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public List<BlockPos> findSpotsToPlace(FakePlayer fakePlayer) {
public boolean isBlockPosValid(BlockPos blockPos, FakePlayer fakePlayer) {
if (!super.isBlockPosValid(blockPos, fakePlayer))
return false; //Do the same checks as normal, then check the filters
ItemStack blockItemStack = level.getBlockState(blockPos.relative(getDirectionValue())).getCloneItemStack(blockPos, level, false, null);
ItemStack blockItemStack = level.getBlockState(blockPos.relative(getDirectionValue())).getCloneItemStack(blockPos, level, false, fakePlayer);
return isStackValidFilter(blockItemStack);
}
}
3 changes: 2 additions & 1 deletion src/main/java/com/direwolf20/justdirethings/common/blockentities/SensorT1BE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.entity.player.Player;
Expand Down Expand Up @@ -326,7 +327,7 @@ public boolean handleBlockStates(BlockPos blockPos, BlockState blockState, Liqui
}

public boolean handleBlockStates(BlockPos blockPos, BlockState blockState) {
ItemStack blockItemStack = blockState.getCloneItemStack(blockPos, level, false, null);
ItemStack blockItemStack = blockState.getCloneItemStack(blockPos, level, false, getUsefulFakePlayer((ServerLevel) level));
boolean allowList = filterData.allowlist;
if (blockStateFilterCache.containsKey(blockState))
return blockStateFilterCache.get(blockState);
Expand Down