Items can lower Drunkeness when consumed

This commit is contained in:
Sn0wStorm
2013-08-14 21:18:11 +02:00
parent e2e6448cf6
commit ac9975fce9
5 changed files with 58 additions and 13 deletions
+27 -9
View File
@@ -9,6 +9,7 @@ import org.bukkit.entity.Player;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Item;
import org.bukkit.inventory.ItemStack;
import org.bukkit.Material;
import org.bukkit.util.Vector;
import org.bukkit.Location;
import org.bukkit.potion.PotionEffectType;
@@ -18,6 +19,7 @@ import com.dre.brewery.Brew;
public class BPlayer {
public static Map<String, BPlayer> players = new HashMap<String, BPlayer>();// Players name and BPlayer
public static Map<Material, Integer> drainItems = new HashMap<Material, Integer>();// DrainItem Material and Strength
private static Map<Player, Integer> pTasks = new HashMap<Player, Integer>();// Player and count
private static int taskId;
public static int pukeItemId;
@@ -121,6 +123,30 @@ public class BPlayer {
}
}
// Eat something to drain the drunkeness
public void drainByItem(String name, Material mat) {
int strength = drainItems.get(mat);
if (drain(name, strength)) {
players.remove(name);
}
}
// drain the drunkeness by amount, returns true when player has to be removed
public boolean drain(String name, int amount) {
quality -= getQuality() * amount;
drunkeness -= amount;
if (drunkeness > 0) {
if (offlineDrunk == 0) {
if (getPlayer(name) == null) {
offlineDrunk = drunkeness;
}
}
} else if (drunkeness <= (-1) * offlineDrunk) {
return true;
}
return false;
}
// player is drunk
public void move(PlayerMoveEvent event) {
// has player more alc than 10
@@ -400,15 +426,7 @@ public class BPlayer {
// Prevent 0 drunkeness
soberPerMin++;
}
bplayer.quality -= bplayer.getQuality() * soberPerMin;
bplayer.drunkeness -= soberPerMin;
if (bplayer.drunkeness > 0) {
if (bplayer.offlineDrunk == 0) {
if (getPlayer(name) == null) {
bplayer.offlineDrunk = bplayer.drunkeness;
}
}
} else if (bplayer.drunkeness <= (-1) * bplayer.offlineDrunk) {
if (bplayer.drain(name, soberPerMin)) {
iter.remove();
}
}