Skip to content

Protect cushion placement through existing item handling #2318

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
me4502 merged 5 commits into from
Oct 22, 2026
+16 −0
Merged

Protect cushion placement through existing item handling #2318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a18a9a0
Protect cushion placement in claimed regions
strobil Oct 19, 2026
d4c7a1f
Use entity placement events for all player-placed entities
strobil Oct 19, 2026
81d87bf
Minimize the entity placement diff
strobil Oct 19, 2026
2dd62c0
Handle cushions through the existing item placement path
strobil Oct 19, 2026
e0b2347
Add a cushion material helper matching the boat check
strobil Oct 19, 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: 6 additions & 0 deletions ...d-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1274,6 +1274,12 @@ private static <T extends Event & Cancellable> void handleBlockRightClick(T even
return;
}

// Handle created cushions
if (item != null && Materials.isCushion(item.getType())) {
Events.fireToCancel(event, new SpawnEntityEvent(event, cause, placed.getLocation().add(0.5, 0, 0.5), EntityType.CUSHION));
return;
}

// Handle created armor stands
if (item != null && item.getType() == Material.ARMOR_STAND) {
Events.fireToCancel(event, new SpawnEntityEvent(event, cause, placed.getLocation().add(0.5, 0, 0.5), EntityType.ARMOR_STAND));
Expand Down
10 changes: 10 additions & 0 deletions worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,16 @@ public static boolean isBoat(Material material) {
return Tag.ITEMS_BOATS.isTagged(material);
}

/**
* Test whether the given material is a Cushion.
*
* @param material the material
* @return true if a Cushion item
*/
public static boolean isCushion(Material material) {
return Tag.ITEMS_CUSHIONS.isTagged(material);
}

/**
* Test whether the given material is a Shulker Box.
*
Expand Down
Loading