Skip to content

Disable chain conveyors for spectators #10145

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
JensenJ wants to merge 1 commit into
base: mc1.21.1/dev
Choose a base branch
from
Open

Disable chain conveyors for spectators #10145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions ...a/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ public static void clientTick() {
private static boolean isActive() {
Minecraft mc = Minecraft.getInstance();
ItemStack mainHandItem = mc.player.getMainHandItem();
if (mc.player.isSpectator())
return false;
return mc.player.isHolding(AllItemTags.CHAIN_RIDEABLE::matches) || AllBlocks.PACKAGE_FROGPORT.isIn(mainHandItem)
|| PackageItem.isPackage(mainHandItem);
}
Expand All @@ -125,6 +127,9 @@ public static boolean onUse() {
Minecraft mc = Minecraft.getInstance();
ItemStack mainHandItem = mc.player.getMainHandItem();

if (mc.player.isSpectator())
return false;

if (mc.player.isHolding(AllItemTags.CHAIN_RIDEABLE::matches)) {
ItemStack offHandItem = mc.player.getOffhandItem();
ItemStack usedItem = AllItemTags.CHAIN_RIDEABLE.matches(mainHandItem) ? mainHandItem : offHandItem;
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorRidingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public static void clientTick() {
return;
}
BlockEntity blockEntity = mc.level.getBlockEntity(ridingChainConveyor);
if (mc.player.isShiftKeyDown() || !(blockEntity instanceof ChainConveyorBlockEntity clbe)) {
if (mc.player.isSpectator() || mc.player.isShiftKeyDown() || !(blockEntity instanceof ChainConveyorBlockEntity clbe)) {
stopRiding();
return;
}
Expand Down
Loading