Skip to content

Retain glass #12

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

Open
pruby wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Retain glass #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df8aab9
Allow reclaiming bottles when using XP bottles on table
Jan 25, 2013
eada1cd
No potion effect when saving bottles
Jan 25, 2013
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
28 changes: 20 additions & 8 deletions src/com/untamedears/bottleO/EventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ public void onPlayerInteractEvent(PlayerInteractEvent e) {
}
}
}
} else if (e.getMaterial() == Material.EMERALD || e.getMaterial() == Material.EMERALD_BLOCK) {
} else if (e.getMaterial() == Material.EMERALD || e.getMaterial() == Material.EMERALD_BLOCK || e.getMaterial() == Material.EXP_BOTTLE) {
Player p = e.getPlayer();
//check player has waited for the required amount of time
if (!playerWaitHash.containsKey(p.getName())) {
Expand All @@ -211,17 +211,29 @@ public void onPlayerInteractEvent(PlayerInteractEvent e) {
ItemStack i = p.getItemInHand();
Material m = e.getMaterial();
int amount = i.getAmount();
int xp = amount*BOTTLES_PER_EMERALD*XP_PER_BOTTLE;
if (m == Material.EMERALD_BLOCK) {
xp *= EMERALDS_PER_BLOCK;
int xp = 0;
switch (m) {
case EMERALD_BLOCK:
xp = amount * EMERALDS_PER_BLOCK * BOTTLES_PER_EMERALD * XP_PER_BOTTLE;
break;
case EMERALD:
xp = amount * BOTTLES_PER_EMERALD * XP_PER_BOTTLE;
break;
case EXP_BOTTLE:
xp = amount * XP_PER_BOTTLE;
break;
}
PlayerExpChangeEvent event = new PlayerExpChangeEvent(p, xp);
Bukkit.getPluginManager().callEvent(event);

//destroy items
p.setItemInHand(new ItemStack(Material.AIR));

p.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 40, 3));
if (m == Material.EXP_BOTTLE) {
//return empty bottles
p.setItemInHand(new ItemStack(Material.GLASS_BOTTLE, amount));
} else {
//destroy items
p.setItemInHand(new ItemStack(Material.AIR));
p.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 40, 3));
}

//restart cool-down timer
playerWaitHash.put(p.getName(), System.currentTimeMillis());
Expand Down