From 8bf6d6047daa54f1c754db3c16a5d213872f9f75 Mon Sep 17 00:00:00 2001 From: cmastudios Date: Wed, 26 Feb 2014 19:02:32 -0600 Subject: [PATCH] Literally none of those new features worked I better test before commit next time :) --- war/src/main/java/com/tommytony/war/War.java | 4 ++-- war/src/main/java/com/tommytony/war/Warzone.java | 9 +++++++-- .../java/com/tommytony/war/event/WarPlayerListener.java | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/war/src/main/java/com/tommytony/war/War.java b/war/src/main/java/com/tommytony/war/War.java index 7cc80b6..a0d8bc0 100644 --- a/war/src/main/java/com/tommytony/war/War.java +++ b/war/src/main/java/com/tommytony/war/War.java @@ -1326,11 +1326,11 @@ public class War extends JavaPlugin { /** * Convert serialized effect to actual effect. * @param serializedEffect String stored in configuration. - * Format: TYPE:DURATION:AMPLIFY + * Format: TYPE;DURATION;AMPLIFY * @return Potion effect or null otherwise */ public PotionEffect getPotionEffect(String serializedEffect) { - String[] arr = serializedEffect.split(":"); + String[] arr = serializedEffect.split(";"); if (arr.length != 3) return null; try { PotionEffectType type = PotionEffectType.getByName(arr[0]); diff --git a/war/src/main/java/com/tommytony/war/Warzone.java b/war/src/main/java/com/tommytony/war/Warzone.java index 5287c6b..9b18813 100644 --- a/war/src/main/java/com/tommytony/war/Warzone.java +++ b/war/src/main/java/com/tommytony/war/Warzone.java @@ -453,10 +453,15 @@ public class Warzone { // clear potion effects PotionEffectHelper.clearPotionEffects(player); - if (!team.getTeamConfig().getString(TeamConfig.APPLYPOTION).isEmpty()) { - PotionEffect effect = War.war.getPotionEffect(team.getTeamConfig().getString(TeamConfig.APPLYPOTION)); + String potionEffect = team.getTeamConfig().resolveString(TeamConfig.APPLYPOTION); + if (!potionEffect.isEmpty()) { + PotionEffect effect = War.war.getPotionEffect(potionEffect); if (effect != null) { player.addPotionEffect(effect); + } else { + War.war.getLogger().log(Level.WARNING, + "Failed to apply potion effect {0} in warzone {1}.", + new Object[] {potionEffect, name}); } } diff --git a/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java b/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java index 295eca5..902420c 100644 --- a/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java +++ b/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java @@ -77,7 +77,7 @@ public class WarPlayerListener implements Listener { @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) public void onPlayerJoin(final PlayerJoinEvent event) { String autojoinName = War.war.getWarConfig().getString(WarConfig.AUTOJOIN); - boolean autojoinEnabled = autojoinName.isEmpty(); + boolean autojoinEnabled = !autojoinName.isEmpty(); if (autojoinEnabled) { // Won't be able to find warzone if unset Warzone autojoinWarzone = Warzone.getZoneByNameExact(autojoinName); if (autojoinWarzone == null) {