From 83006399a9a72fcadbc360c185b83ae5a9dd839a Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Fri, 12 Dec 2014 10:36:18 +0100 Subject: [PATCH] Removed dormant universe support in HeroChat. Fixes #718. --- .../integration/herochat/ChannelFactionsAbstract.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java b/src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java index d42d4f4a..49804bc7 100644 --- a/src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java +++ b/src/main/java/com/massivecraft/factions/integration/herochat/ChannelFactionsAbstract.java @@ -229,16 +229,12 @@ public abstract class ChannelFactionsAbstract implements Channel { Set ret = new HashSet(); - // TODO: Dormant non-erased universe support? - - MPlayer fpsender = MPlayer.get(sender); - Faction faction = fpsender.getFaction(); - String universe = fpsender.getUniverse(); + MPlayer fsender = MPlayer.get(sender); + Faction faction = fsender.getFaction(); for (Player player : MUtil.getOnlinePlayers()) { MPlayer frecipient = MPlayer.get(player); - if (!frecipient.getUniverse().equals(universe)) continue; if (!this.getTargetRelations().contains(faction.getRelationTo(frecipient))) continue; ret.add(player); }