From c512f808666fa0813108fb10c2ce9983eecaf558 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Tue, 23 Aug 2011 21:49:49 -0500 Subject: [PATCH] Release 1.4.7: bugfix for exception triggered by blank cape URL --- src/com/massivecraft/factions/SpoutFeatures.java | 10 +++++++++- src/plugin.yml | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/com/massivecraft/factions/SpoutFeatures.java b/src/com/massivecraft/factions/SpoutFeatures.java index d78eb4b8..fabf29f3 100644 --- a/src/com/massivecraft/factions/SpoutFeatures.java +++ b/src/com/massivecraft/factions/SpoutFeatures.java @@ -169,7 +169,15 @@ public class SpoutFeatures { else if (relation.isAlly()) { cape = Conf.capeAlly; } - spoutApp.setPlayerCloak(sPlayer, viewed, cape); + + if (cape.isEmpty()) { + spoutApp.resetPlayerCloak(sPlayer, viewed); + } else { + spoutApp.setPlayerCloak(sPlayer, viewed, cape); + } + } + else if (Conf.spoutFactionAdminCapes || Conf.spoutFactionModeratorCapes) { + spoutApp.resetPlayerCloak(sPlayer, viewed); } } diff --git a/src/plugin.yml b/src/plugin.yml index 9b9e188b..3607ab2e 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,5 +1,5 @@ name: Factions -version: 1.4.6 +version: 1.4.7 main: com.massivecraft.factions.Factions softdepend: - Permissions