Anura/AnuraCore
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge origin/master

Browse Source
This commit is contained in:
kaenganxt
2014-12-22 21:00:14 +01:00
parent 9406f426fa 64e7f3cc7f
commit 468557dfba
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/de/anura/core/FlowerPots.java
View File

@@ -112,12 +112,12 @@ public class FlowerPots {
loc.getWorld().playEffect(loc, Effect.FIREWORKS_SPARK, 4); loc.getWorld().playEffect(loc, Effect.FIREWORKS_SPARK, 4);
} }
P.playSound(loc, Sound.LEVEL_UP, 1, (float) 1.5); P.playSound(loc, Sound.LEVEL_UP, 1, (float) 1.5);
ResultSet rs = AnuraCore.getSql().querySelect("SELECT url, name, money FROM corePots WHERE id = '" + pot + "'"); ResultSet rs = AnuraCore.getSql().querySelect("SELECT id, url, name, money FROM corePots WHERE id = '" + pot + "'");
rs.first(); rs.first();
Money.payMoney(P, rs.getInt("money")); Money.payMoney(P, rs.getInt("money"));
P.sendMessage(ChatColor.RED + "---------- " + ChatColor.YELLOW + "Achievement" + ChatColor.RED + " ----------"); P.sendMessage(ChatColor.RED + "---------- " + ChatColor.YELLOW + "Achievement" + ChatColor.RED + " ----------");
P.sendMessage(ChatColor.BLUE + rs.getString("name")); P.sendMessage(ChatColor.BLUE + Core.getl(rs.getString("name"), Core.getPlayerLang(P)));
P.sendMessage("" + ChatColor.GOLD + ChatColor.UNDERLINE + rs.getString("url")); P.sendMessage("" + ChatColor.GOLD + ChatColor.UNDERLINE + "http://mc-anura.de/index.php?location=achievement_" + rs.getString("id"));
P.sendMessage(""); P.sendMessage("");
P.sendMessage(ChatColor.RED + "---------- " + ChatColor.YELLOW + "Achievement" + ChatColor.RED + " ----------"); P.sendMessage(ChatColor.RED + "---------- " + ChatColor.YELLOW + "Achievement" + ChatColor.RED + " ----------");
} else if (getPotWaitTime(pot) != -1 && foundCache.containsKey(P) && foundCache.get(P).containsKey(pot) && foundTimestamp.containsKey(P) && foundTimestamp.get(P).containsKey(pot)) { } else if (getPotWaitTime(pot) != -1 && foundCache.containsKey(P) && foundCache.get(P).containsKey(pot) && foundTimestamp.containsKey(P) && foundTimestamp.get(P).containsKey(pot)) {