Skip to content

fix copper golems putting shulkers into shulkers while using "can-open-shulker" #1753

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

Closed
iamgabrieltv wants to merge 1 commit into from
Closed

fix copper golems putting shulkers into shulkers while using "can-open-shulker" #1753

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
14 changes: 14 additions & 0 deletions ...sources/net/minecraft/world/entity/ai/behavior/TransportItemsBetweenContainers.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,20 @@
double d1 = chestBlockEntity.getBlockPos().distToCenterSqr(mob.position());
if (d1 < d) {
TransportItemsBetweenContainers.TransportItemTarget transportItemTarget1 = this.isTargetValidToPick(
@@ -324,6 +_,13 @@
&& !this.isContainerLocked(transportItemTarget)
&& org.bukkit.craftbukkit.event.CraftEventFactory.callTransporterValidateTarget(mob, level, transportItemTarget.pos);
// Paper end - ItemTransportingEntityValidateTargetEvent
+ // Purpur start - fix copper golems putting shulkers into shulkers
+ if (level.purpurConfig.copperGolemCanOpenShulker) {
+ net.minecraft.world.level.block.Block heldBlock = net.minecraft.world.level.block.Block.byItem(mob.getMainHandItem().getItem());
+ boolean isHoldingShulker = heldBlock instanceof net.minecraft.world.level.block.ShulkerBoxBlock;
+ if (transportItemTarget.blockEntity instanceof net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity && isHoldingShulker) return null;
+ }
+ // Purpur end - fix copper golems putting shulkers into shulkers
return flag1 ? transportItemTarget : null;
}
}
@@ -369,7 +_,11 @@
}

Expand Down