mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Remove version dependent method

Browse Source
This commit is contained in:
JustAHuman-xD 2023-07-26 22:46:29 -05:00
parent dc22e66589
commit 74624e6e6d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AncientPedestal.java
View File

@ -94,7 +94,7 @@ public class AncientPedestal extends SimpleSlimefunItem<BlockDispenseHandler> im
public @Nonnull Optional<Item> getPlacedItem(@Nonnull Block pedestal) {
Location l = pedestal.getLocation().add(0.5, 1.2, 0.5);
for (Entity n : l.getWorld().getNearbyEntities(l, 0.5, 0.5, 0.5, this::testItem)) {
for (Entity n : l.getWorld().getNearbyEntities(l, 0.5, 0.5, 0.5, AncientPedestal::testItem)) {
if (n instanceof Item item) {
return Optional.of(item);
}
@ -120,7 +120,7 @@ public class AncientPedestal extends SimpleSlimefunItem<BlockDispenseHandler> im
return createIfNoneExists ? ArmorStandUtils.spawnArmorStand(l) : null;
}
private boolean testItem(@Nullable Entity n) {
public static boolean testItem(@Nullable Entity n) {
if (n instanceof Item item && n.isValid()) {
ItemMeta meta = item.getItemStack().getItemMeta();
@ -172,7 +172,6 @@ public class AncientPedestal extends SimpleSlimefunItem<BlockDispenseHandler> im
if (entity != null) {
ArmorStand armorStand = getArmorStand(b, true);
entity.setInvulnerable(true);
entity.setUnlimitedLifetime(true);
entity.setVelocity(new Vector(0, 0.1, 0));
entity.setCustomNameVisible(true);
entity.setCustomName(nametag);

8
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/AncientAltarListener.java
View File

@ -24,6 +24,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.ItemDespawnEvent;
import org.bukkit.inventory.ItemStack;
import io.github.bakedlibs.dough.items.CustomItemStack;
@ -357,4 +358,11 @@ public class AncientAltarListener implements Listener {
return Optional.empty();
}
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onItemDespawn(ItemDespawnEvent e) {
if (AncientPedestal.testItem(e.getEntity())) {
e.setCancelled(true);
}
}
}