/br -> /brew, added Persistence

This commit is contained in:
Sn0wStorm
2014-06-03 23:10:47 +02:00
parent a4b9b08f82
commit 28dcfbe5d2
8 changed files with 137 additions and 63 deletions
+24 -29
View File
@@ -77,39 +77,34 @@ public class BPlayer {
return org.bukkit.Bukkit.getPlayerExact(name);
}
// returns true if drinking was successful
public static boolean drink(int uid, Player player) {
Brew brew = Brew.get(uid);
if (brew != null) {
int brewAlc = brew.calcAlcohol();
if (brewAlc == 0) {
//no alcohol so we dont need to add a BPlayer
addBrewEffects(brew, player);
return true;
}
BPlayer bPlayer = get(player.getName());
if (bPlayer == null) {
bPlayer = new BPlayer();
players.put(player.getName(), bPlayer);
}
bPlayer.drunkeness += brewAlc;
if (brew.getQuality() > 0) {
bPlayer.quality += brew.getQuality() * brewAlc;
} else {
bPlayer.quality += brewAlc;
}
// Drink a brew and apply effects, etc.
public static void drink(Brew brew, Player player) {
int brewAlc = brew.calcAlcohol();
if (brewAlc == 0) {
//no alcohol so we dont need to add a BPlayer
addBrewEffects(brew, player);
return;
}
BPlayer bPlayer = get(player.getName());
if (bPlayer == null) {
bPlayer = new BPlayer();
players.put(player.getName(), bPlayer);
}
bPlayer.drunkeness += brewAlc;
if (brew.getQuality() > 0) {
bPlayer.quality += brew.getQuality() * brewAlc;
} else {
bPlayer.quality += brewAlc;
}
if (bPlayer.drunkeness <= 100) {
if (bPlayer.drunkeness <= 100) {
addBrewEffects(brew, player);
addQualityEffects(brew.getQuality(), brewAlc, player);
addBrewEffects(brew, player);
addQualityEffects(brew.getQuality(), brewAlc, player);
} else {
bPlayer.drinkCap(player);
}
return true;
} else {
bPlayer.drinkCap(player);
}
return false;
}
// Player has drunken too much