mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

Fixed Ancient Altar Dupe Bug

Browse Source
This commit is contained in:
TheBusyBiscuit 2016-11-13 09:39:13 +01:00 committed by GitHub
parent dbb3847645
commit 13f208a3b6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/me/mrCookieSlime/Slimefun/listeners/AncientAltarListener.java
View File

@ -77,7 +77,7 @@ public class AncientAltarListener implements Listener {
else if (item.getName().equals("ANCIENT_ALTAR")) { else if (item.getName().equals("ANCIENT_ALTAR")) {
e.setCancelled(true); e.setCancelled(true);
ItemStack catalyst = e.getPlayer().getInventory().getItemInMainHand(); ItemStack catalyst = new CustomItem(e.getPlayer().getInventory().getItemInMainHand(), 1);
List<Block> pedestals = Pedestals.getPedestals(b); List<Block> pedestals = Pedestals.getPedestals(b);
if (!altars.contains(e.getClickedBlock())) { if (!altars.contains(e.getClickedBlock())) {
@ -145,7 +145,7 @@ public class AncientAltarListener implements Listener {
if (stack != null && !stack.getType().equals(Material.AIR)) { if (stack != null && !stack.getType().equals(Material.AIR)) {
PlayerInventory.consumeItemInHand(p); PlayerInventory.consumeItemInHand(p);
String nametag = StringUtils.formatItemName(stack, false); String nametag = StringUtils.formatItemName(stack, false);
Item entity = b.getWorld().dropItem(b.getLocation().add(0.5, 1.2, 0.5), new CustomItem(new CustomItem(stack, 1), "§5§dALTAR §3Probe - §e" + System.nanoTime())); Item entity = b.getWorld().dropItem(b.getLocation().add(0.5, 1.2, 0.5), new CustomItem(new CustomItem(stack, 1), "§5§dALTAR §3Probe - §e" + System.nanoTime()));
entity.setVelocity(new Vector(0, 0.1, 0)); entity.setVelocity(new Vector(0, 0.1, 0));
entity.setMetadata("no_pickup", new FixedMetadataValue(SlimefunStartup.instance, "altar_item")); entity.setMetadata("no_pickup", new FixedMetadataValue(SlimefunStartup.instance, "altar_item"));
entity.setCustomNameVisible(true); entity.setCustomNameVisible(true);
@ -157,7 +157,7 @@ public class AncientAltarListener implements Listener {
@EventHandler @EventHandler
public void onPickup(PlayerPickupItemEvent e) { public void onPickup(PlayerPickupItemEvent e) {
if (e.getItem().hasMetadata("no_pickup")) e.setCancelled(true); if (e.getItem().hasMetadata("no_pickup")) e.setCancelled(true);
else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith("§5§dALTAR §3Probe - §e")) { else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith("§5§dALTAR §3Probe - §e")) {
e.setCancelled(true); e.setCancelled(true);
e.getItem().remove(); e.getItem().remove();
} }