exituser/Brewery
1
0
Fork 0
mirror of https://github.com/exituser/Brewery.git synced 2026-09-17 06:38:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Instant Effects

Browse Source
This commit is contained in:
Sn0wStorm
2013-08-19 17:14:43 +02:00
parent ab6312331e
commit a166d6cfe6
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.yml
+2 -1
View File
@@ -60,6 +60,7 @@ autosave: 3
# alcohol: Alkoholgehalt 0-100 in absoluter Menge bei perfektem Getränk (wird dem Spieler hinzugefügt, bei 100 = tot) # alcohol: Alkoholgehalt 0-100 in absoluter Menge bei perfektem Getränk (wird dem Spieler hinzugefügt, bei 100 = tot)
# effects: Auflistung Effekt/Dauer Besonderere Trank-Effekte beim Trinken, Dauer in sek. Ein 'X' an den Namen anhängen, um ihn zu verbergen. Bsp: POISONX/10 # effects: Auflistung Effekt/Dauer Besonderere Trank-Effekte beim Trinken, Dauer in sek. Ein 'X' an den Namen anhängen, um ihn zu verbergen. Bsp: POISONX/10
# (WEAKNESS, INCREASE_DAMAGE, SLOW und SPEED sind immer verborgen.) Mögliche Effekte: http://jd.bukkit.org/rb/apidocs/org/bukkit/potion/PotionEffectType.html # (WEAKNESS, INCREASE_DAMAGE, SLOW und SPEED sind immer verborgen.) Mögliche Effekte: http://jd.bukkit.org/rb/apidocs/org/bukkit/potion/PotionEffectType.html
# Bei Effekten mit sofortiger Wirkung (z.B. HEAL) muss anstatt der Dauer das Level angegeben werden.
recipes: recipes:
1: 1:
@@ -166,7 +167,7 @@ recipes:
color: PINK color: PINK
difficulty: 1 difficulty: 1
effects: effects:
- HEAL - HEAL/1
src/com/dre/brewery/BPlayer.java
+8 -5
View File
@@ -21,7 +21,7 @@ public class BPlayer {
public static Map<String, BPlayer> players = new HashMap<String, BPlayer>();// Players name and 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 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 Map<Player, Integer> pTasks = new HashMap<Player, Integer>();// Player and count
// Settings // Settings
private static int taskId; private static int taskId;
public static int pukeItemId; public static int pukeItemId;
@@ -391,10 +391,13 @@ public class BPlayer {
for (Map.Entry<String, Integer> entry : effects.entrySet()) { for (Map.Entry<String, Integer> entry : effects.entrySet()) {
PotionEffectType type = PotionEffectType.getByName(entry.getKey().replace("X", "")); PotionEffectType type = PotionEffectType.getByName(entry.getKey().replace("X", ""));
if (type != null) { if (type != null) {
int duration = (entry.getValue() / 8) * brew.getQuality() * 20; int duration = (entry.getValue() * brew.getQuality()) / 8;
int amplifier = brew.getQuality() / 3; if (type.isInstant()) {
type.createEffect(0, duration - 1).apply(player);
type.createEffect(duration, amplifier).apply(player); } else {
int amplifier = brew.getQuality() / 3;
type.createEffect(duration * 20, amplifier).apply(player);
}
} }
} }
} }