sigonasr2/SigMinecraft
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
sigonasr2 2013-11-27 14:39:34 -07:00
commit 8e0c9aee38
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
View File

@ -847,7 +847,7 @@ implements Listener
@EventHandler @EventHandler
public void onPlayerItemConsume(PlayerItemConsumeEvent e) { public void onPlayerItemConsume(PlayerItemConsumeEvent e) {
Player p = e.getPlayer(); Player p = e.getPlayer();
if (e.getItem().getType() == Material.COOKED_CHICKEN) { if (e.getItem().getType() == Material.COOKED_CHICKEN && this.plugin.getConfig().getBoolean("thanksgiving-enabled")) {
p.addPotionEffect(new PotionEffect(PotionEffectType.SATURATION, 18000, 0), true); p.addPotionEffect(new PotionEffect(PotionEffectType.SATURATION, 18000, 0), true);
p.addPotionEffect(new PotionEffect(PotionEffectType.HEALTH_BOOST, 18000, 4), true); p.addPotionEffect(new PotionEffect(PotionEffectType.HEALTH_BOOST, 18000, 4), true);
p.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 18000, 2), true); p.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 18000, 2), true);

1
BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java
View File

@ -49,6 +49,7 @@ import sig.ItemSets.DiabloDropsHook;
import sig.ItemSets.DiabloDropsHook.Tier; import sig.ItemSets.DiabloDropsHook.Tier;
import sig.ItemSets.DiabloDropsHook; import sig.ItemSets.DiabloDropsHook;
import sig.ItemSets.DiabloDropsHook.Tier;
import com.sk89q.worldedit.CuboidClipboard; import com.sk89q.worldedit.CuboidClipboard;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;