Skip to content

[Fix] Correct piston merge related logic #735

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

Merged
TylerS1066 merged 3 commits into from
Apr 27, 2025
Merged

[Fix] Correct piston merge related logic #735

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c2c85c
Merge pull request #21 from APDevTeam/main
DerToaster98 Jan 27, 2025
37fe993
Correct piston logic
DerToaster98 Feb 25, 2025
ec2b46a
Update BlockListener.java
DerToaster98 Mar 17, 2025
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
17 changes: 8 additions & 9 deletions Movecraft/src/main/java/net/countercraft/movecraft/listener/BlockListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import org.bukkit.material.Attachable;
import org.bukkit.util.Vector;
import org.jetbrains.annotations.NotNull;
import java.util.List;

public class BlockListener implements Listener {
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
Expand Down Expand Up @@ -126,15 +127,15 @@ public void onRedstoneEvent(@NotNull BlockRedstoneEvent e) {

@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onPistonExtendEvent(@NotNull BlockPistonExtendEvent e) {
onPistonEvent(e);
onPistonEvent(e, e.getBlocks());
}

@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onPistonRetractEvent(@NotNull BlockPistonRetractEvent e) {
onPistonEvent(e);
onPistonEvent(e, e.getBlocks());
}

public void onPistonEvent(@NotNull BlockPistonEvent e) {
public void onPistonEvent(@NotNull BlockPistonEvent e, final @NotNull List<Block> affectedBlocks) {
Block block = e.getBlock();
Location location = block.getLocation();
MovecraftLocation loc = MathUtils.bukkit2MovecraftLoc(location);
Expand All @@ -143,15 +144,13 @@ public void onPistonEvent(@NotNull BlockPistonEvent e) {
continue;

if (!craft.isNotProcessing())
e.setCancelled(true); // prevent pistons on cruising crafts
if (!(e instanceof BlockPistonExtendEvent))
return;
// merge piston extensions to craft
if (craft.getType().getBoolProperty(CraftType.MERGE_PISTON_EXTENSIONS))
e.setCancelled(true); // prevent pistons on cruising crafts
// merge piston extensions to craft if the property is true
if (!craft.getType().getBoolProperty(CraftType.MERGE_PISTON_EXTENSIONS))
continue;

BitmapHitBox hitBox = new BitmapHitBox();
for (Block b : ((BlockPistonExtendEvent) e).getBlocks()) {
for (Block b : affectedBlocks) {
Vector dir = e.getDirection().getDirection();
hitBox.add(new MovecraftLocation(b.getX() + dir.getBlockX(), b.getY() + dir.getBlockY(), b.getZ() + dir.getBlockZ()));
}
Expand Down