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

Removing all changes.

Browse Source
This commit is contained in:
Rick 2018-04-22 12:48:00 -04:00
parent 91587048c3
commit 444cb1538e
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,8 +37,6 @@ import org.bukkit.util.Vector;
public class AncientAltarListener implements Listener { public class AncientAltarListener implements Listener {
public static boolean altarinuse = false;
public AncientAltarListener(SlimefunStartup plugin) { public AncientAltarListener(SlimefunStartup plugin) {
plugin.getServer().getPluginManager().registerEvents(this, plugin); plugin.getServer().getPluginManager().registerEvents(this, plugin);
} }
@ -48,10 +46,6 @@ public class AncientAltarListener implements Listener {
@EventHandler(priority=EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority=EventPriority.HIGH, ignoreCancelled = true)
public void onInteract(PlayerInteractEvent e) { public void onInteract(PlayerInteractEvent e) {
if (altarinuse) {
e.setCancelled(true);
return;
}
if (e.getAction() != Action.RIGHT_CLICK_BLOCK) return; if (e.getAction() != Action.RIGHT_CLICK_BLOCK) return;
Block b = e.getClickedBlock(); Block b = e.getClickedBlock();
SlimefunItem item = BlockStorage.check(b); SlimefunItem item = BlockStorage.check(b);
@ -63,7 +57,6 @@ public class AncientAltarListener implements Listener {
if(e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.AIR)) return; if(e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.AIR)) return;
if(b.getRelative(0, 1, 0).getType() != Material.AIR) { if(b.getRelative(0, 1, 0).getType() != Material.AIR) {
Messages.local.sendTranslation(e.getPlayer(), "machines.ANCIENT_PEDESTAL.obstructed", true); Messages.local.sendTranslation(e.getPlayer(), "machines.ANCIENT_PEDESTAL.obstructed", true);
altarinuse = false;
return; return;
} }
insertItem(e.getPlayer(), b); insertItem(e.getPlayer(), b);
@ -87,10 +80,6 @@ public class AncientAltarListener implements Listener {
} }
} }
else if (item.getID().equals("ANCIENT_ALTAR")) { else if (item.getID().equals("ANCIENT_ALTAR")) {
if (altarinuse) {
e.setCancelled(true);
return;
}
e.setCancelled(true); e.setCancelled(true);
ItemStack catalyst = new CustomItem(e.getPlayer().getInventory().getItemInMainHand(), 1); ItemStack catalyst = new CustomItem(e.getPlayer().getInventory().getItemInMainHand(), 1);
@ -105,6 +94,7 @@ public class AncientAltarListener implements Listener {
Item stack = findItem(pedestal); Item stack = findItem(pedestal);
if (stack != null) input.add(fixItemStack(stack.getItemStack(), stack.getCustomName())); if (stack != null) input.add(fixItemStack(stack.getItemStack(), stack.getCustomName()));
} }
ItemStack result = Pedestals.getRecipeOutput(catalyst, input); ItemStack result = Pedestals.getRecipeOutput(catalyst, input);
if (result != null) { if (result != null) {
List<ItemStack> consumed = new ArrayList<ItemStack>(); List<ItemStack> consumed = new ArrayList<ItemStack>();
@ -115,19 +105,16 @@ public class AncientAltarListener implements Listener {
else { else {
altars.remove(e.getClickedBlock()); altars.remove(e.getClickedBlock());
Messages.local.sendTranslation(e.getPlayer(), "machines.ANCIENT_ALTAR.unknown-recipe", true); Messages.local.sendTranslation(e.getPlayer(), "machines.ANCIENT_ALTAR.unknown-recipe", true);
altarinuse = false;
} }
} }
else { else {
altars.remove(e.getClickedBlock()); altars.remove(e.getClickedBlock());
Messages.local.sendTranslation(e.getPlayer(), "machines.ANCIENT_ALTAR.unknown-catalyst", true); Messages.local.sendTranslation(e.getPlayer(), "machines.ANCIENT_ALTAR.unknown-catalyst", true);
altarinuse = false;
} }
} }
else { else {
altars.remove(e.getClickedBlock()); altars.remove(e.getClickedBlock());
Messages.local.sendTranslation(e.getPlayer(), "machines.ANCIENT_ALTAR.not-enough-pedestals", true, new Variable("%pedestals%", String.valueOf(pedestals.size()))); Messages.local.sendTranslation(e.getPlayer(), "machines.ANCIENT_ALTAR.not-enough-pedestals", true, new Variable("%pedestals%", String.valueOf(pedestals.size())));
altarinuse = false;
} }
} }
} }
@ -171,7 +158,7 @@ public class AncientAltarListener implements Listener {
p.playSound(b.getLocation(), Sound.ENTITY_ITEM_PICKUP, 0.3F, 0.3F); p.playSound(b.getLocation(), Sound.ENTITY_ITEM_PICKUP, 0.3F, 0.3F);
} }
} }
@EventHandler (priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler (priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onBlockPlace(BlockPlaceEvent e) { public void onBlockPlace(BlockPlaceEvent e) {
Block b = e.getBlockPlaced().getRelative(0, -1, 0); Block b = e.getBlockPlaced().getRelative(0, -1, 0);