Version Bump + Small fix

xpyctum · Dec 29, 2014 · 14079e1 · 14079e1
1 parent 08905e3
commit 14079e1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/plugin.yml b/plugin.yml
@@ -1,8 +1,9 @@
 name: PureChat
 main: _64FF00\PureChat\PureChat
-version: "1.1.0"
+version: "1.2.0"
 api: [1.9.0]
 load: STARTUP
 author: 64FF00
 website: https://github.com/64FF00/PureChat
-depend: [PurePerms]
+depend: [PurePerms]
+softdepend: [FactionsPro]
diff --git a/src/_64FF00/PureChat/ChatListener.php b/src/_64FF00/PureChat/ChatListener.php
@@ -6,17 +6,6 @@
 
 use pocketmine\event\player\PlayerChatEvent;
 
-/*
-      # #    #####  #       ####### #######   ###     ###   
-      # #   #     # #    #  #       #        #   #   #   #  
-    ####### #       #    #  #       #       #     # #     # 
-      # #   ######  #    #  #####   #####   #     # #     # 
-    ####### #     # ####### #       #       #     # #     # 
-      # #   #     #      #  #       #        #   #   #   #  
-      # #    #####       #  #       #         ###     ###                                        
-                                                                                   
-*/
-
 class ChatListener implements Listener
 {
 	private $plugin;

diff --git a/src/_64FF00/PureChat/PureChat.php b/src/_64FF00/PureChat/PureChat.php
@@ -19,7 +19,7 @@
 
 class PureChat extends PluginBase
 {
-	private $config, $plugin, $factionspro;
+	private $config, $plugin, $factionsPro;
 
 	public function onLoad()
 	{
@@ -29,7 +29,7 @@ public function onLoad()
 	public function onEnable()
 	{
 		$this->plugin = $this->getServer()->getPluginManager()->getPlugin("PurePerms");
-		$this->factionspro = $this->getServer()->getPluginManager()->getPlugin("FactionsPro");
+		$this->factionsPro = $this->getServer()->getPluginManager()->getPlugin("FactionsPro");
 
 		$this->getServer()->getPluginManager()->registerEvents(new ChatListener($this), $this);
 	}
@@ -45,18 +45,27 @@ public function formatMessage(Player $player, $message, $levelName = null)
 		else
 		{
 			$chatFormat = $this->getConfig()->getNested("groups.$groupName.worlds.$levelName");
+
+			if($chatFormat == null)
+			{
+				$this->getConfig()->setNested("groups.$groupName.worlds.$levelName", "[$groupName] %user_name% > %message%");
+
+				$this->getConfig()->save();
+			}
 		}
 
 		$chatFormat = str_replace("%world_name%", $levelName, $chatFormat);
 		$chatFormat = str_replace("%user_name%", $player->getName(), $chatFormat);
 		$chatFormat = str_replace("%message%", $message, $chatFormat);
-		if(!$this->factionspro == false) {
-			if($this->factionspro->isInFaction($player->getName())) {
-				$chatformat = str_replace("%faction%", $this->factionspro->getPlayerFaction($player->getName()), $chatFormat);
+
+		if($this->factionsPro != null) 
+		{
+			if($this->factionsPro->isInFaction($player->getName())) 
+			{
+				$chatFormat = str_replace("%faction%", $this->factionsPro->getPlayerFaction($player->getName()), $chatFormat);
 			}
 		}
 
-
 		return $chatFormat;
 	}