Skip to content

Fix node deletion when a player is next to the furniture #5

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
Drefvelin merged 2 commits into from
Sep 23, 2026
Merged

Fix node deletion when a player is next to the furniture #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59d873a
Fix node deletion when a player is next to the furniture.
Sep 23, 2026
0386044
Keep furniture removal failures from being swallowed.
Sep 23, 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
37 changes: 29 additions & 8 deletions src/main/java/net/tfminecraft/dowsing/objects/Node.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Entity;
import org.bukkit.entity.ItemDisplay;
import org.bukkit.entity.ItemFrame;
import org.bukkit.entity.Player;

import dev.lone.itemsadder.api.CustomFurniture;
Expand Down Expand Up @@ -639,14 +642,7 @@ public void breakNode() {
if(type.equalsIgnoreCase("v")) {
this.loc.getBlock().setType(Material.AIR);
} else if(type.equalsIgnoreCase("ia")) {
Location center = this.loc.clone().add(0.5, 0.5, 0.5);
for(Entity a : this.loc.getWorld().getNearbyEntities(center, 1.5, 1.5, 1.5)) {
CustomFurniture f = CustomFurniture.byAlreadySpawned(a);
if(f != null) {
f.remove(false);
break;
}
}
removeNearbyFurniture();
if(this.loc.getBlock().getType() != Material.AIR) {
this.loc.getBlock().setType(Material.AIR);
}
Expand All @@ -658,4 +654,29 @@ public void breakNode() {
loc.getWorld().playSound(loc, Sound.ENTITY_GLOW_ITEM_FRAME_REMOVE_ITEM, 0.5f, 1f);
NodeManager.requestNodeBenefitSync();
}

private void removeNearbyFurniture() {
Location center = this.loc.clone().add(0.5, 0.5, 0.5);
for(Entity entity : this.loc.getWorld().getNearbyEntities(center, 1.5, 1.5, 1.5)) {
if(!isFurnitureCarrier(entity)) continue;
CustomFurniture furniture = lookupFurniture(entity);
if(furniture != null) {
furniture.remove(false);
break;
}
}
}

private static CustomFurniture lookupFurniture(Entity entity) {
try {
return CustomFurniture.byAlreadySpawned(entity);
} catch (RuntimeException ex) {
// ItemsAdder throws for entities that are not furniture instead of returning null.
return null;
}
}

private static boolean isFurnitureCarrier(Entity entity) {
return entity instanceof ArmorStand || entity instanceof ItemFrame || entity instanceof ItemDisplay;
}
}