Fixing some NPE and similar small issues.

This commit is contained in:
Olof Larsson
2013-04-18 20:28:12 +02:00
parent 5ddfb19861
commit f70cc283db
6 changed files with 13 additions and 9 deletions

View File

@@ -1,6 +1,5 @@
package com.massivecraft.factions.integration.herochat;
import com.dthielke.herochat.Herochat;
import com.massivecraft.mcore.integration.IntegrationFeaturesAbstract;
public class HerochatFeatures extends IntegrationFeaturesAbstract
@@ -20,8 +19,6 @@ public class HerochatFeatures extends IntegrationFeaturesAbstract
@Override
public void activate()
{
Herochat.getChannelManager().addChannel(new FactionChannel());
Herochat.getChannelManager().addChannel(new AlliesChannel());
HerochatListener.get().activate();
}

View File

@@ -7,6 +7,7 @@ import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import com.dthielke.herochat.ChannelChatEvent;
import com.dthielke.herochat.Herochat;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.chat.ChatFormatter;
@@ -28,6 +29,9 @@ public class HerochatListener implements Listener
public void activate()
{
Herochat.getChannelManager().addChannel(new FactionChannel());
Herochat.getChannelManager().addChannel(new AlliesChannel());
Bukkit.getPluginManager().registerEvents(this, Factions.get());
}