Skip to content

Fixes #1104

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
JasperLorelai merged 3 commits into from
Sep 9, 2026
Merged

Fixes #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d97e7d5
fix: NPE
JasperLorelai Sep 7, 2026
eb1f2a6
fix: Place if air AND solid below
JasperLorelai Sep 7, 2026
b922353
fix: Check for isSolid instead of isOccluding
JasperLorelai Sep 7, 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
2 changes: 1 addition & 1 deletion core/src/main/java/com/nisovin/magicspells/spells/passive/TicksListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void initialize(@NotNull String var) {
int interval = Integer.parseInt(var);
ticker = new Ticker(passiveSpell, interval);
} catch (NumberFormatException e) {
// ignored
return;
}

for (World world : Bukkit.getWorlds()) {
Expand Down
16 changes: 6 additions & 10 deletions core/src/main/java/com/nisovin/magicspells/spells/targeted/CarpetSpell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,22 +105,18 @@ public CastResult castAtLocation(SpellData data) {
private CastResult layCarpet(SpellData data) {
Location loc = data.location();

if (!loc.getBlock().getType().isOccluding()) {
if (!loc.getBlock().isSolid()) {
int c = 0;
while (!loc.getBlock().getRelative(0, -1, 0).getType().isOccluding() && c <= 2) {
while (!loc.getBlock().getRelative(0, -1, 0).isSolid() && c <= 2) {
loc.subtract(0, 1, 0);
c++;
}

data = data.location(loc);
} else {
int c = 0;
while (loc.getBlock().getType().isOccluding() && c <= 2) {
while (loc.getBlock().isSolid() && c <= 2) {
loc.add(0, 1, 0);
c++;
}

data = data.location(loc);
}

Block b;
Expand All @@ -141,10 +137,10 @@ private CastResult layCarpet(SpellData data) {
b = loc.getWorld().getBlockAt(x, y, z);
if (circle && loc.getBlock().getLocation().distanceSquared(b.getLocation()) > rad * rad) continue;

if (b.getType().isOccluding()) b = b.getRelative(0, 1, 0);
else if (!b.getRelative(0, -1, 0).getType().isOccluding()) b = b.getRelative(0, -1, 0);
if (b.isSolid()) b = b.getRelative(0, 1, 0);
else if (!b.getRelative(0, -1, 0).isSolid()) b = b.getRelative(0, -1, 0);

if (!b.getType().isAir() && !b.getRelative(0, -1, 0).getType().isSolid()) continue;
if (!b.isEmpty() || !b.getRelative(0, -1, 0).isSolid()) continue;

blocks.put(b, new CarpetData(data, material, b.getType(), removeOnTouch));
b.setType(material, false);
Expand Down
Loading