From 0fdf3707330f519148e17ab953e2a6e06be425c9 Mon Sep 17 00:00:00 2001
From: neersighted <neersighted@neersighted.com>
Date: Tue, 28 Feb 2012 09:06:12 +0800
Subject: [PATCH] realize mcpaid was already in mctools.py, so remove it

---
 plugins/mcpaid.py  | 7 -------
 plugins/mctools.py | 8 ++++----
 2 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 plugins/mcpaid.py

diff --git a/plugins/mcpaid.py b/plugins/mcpaid.py
deleted file mode 100644
index dd3e983..0000000
--- a/plugins/mcpaid.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from util import hook, http
-
-
-@hook.command
-def mcpaid(inp):
-    ".mcpaid <username> -- checks if minecraft <username> has paid for the game"
-    return " ".join([x for x in http.get("http://www.minecraft.net/haspaid.jsp", user=inp).splitlines() if x])
\ No newline at end of file
diff --git a/plugins/mctools.py b/plugins/mctools.py
index dc2a296..947e031 100644
--- a/plugins/mctools.py
+++ b/plugins/mctools.py
@@ -3,7 +3,7 @@ import string
 
 @hook.command(autohelp=False)
 def mcstatus(inp, bot=None):
-    ".mcstatus - Attempts to log in to minecraft"
+    ".mcstatus -- Attempts to log in to minecraft"
     username = bot.config.get("api_keys", {}).get("mc_user", None)
     password = bot.config.get("api_keys", {}).get("mc_pass", None)
     if password is None:
@@ -17,7 +17,7 @@ def mcstatus(inp, bot=None):
 
 @hook.command
 def mclogin(inp, say=None):
-    ".mclogin <username> <password> - Attempts to log in to minecraft using the provided username and password, this is NOT logged."
+    ".mclogin <username> <password> -- Attempts to log in to minecraft using the provided username and password, this is NOT logged."
     inp = inp.split(" ")
     username = inp[0]
     password = inp[1]
@@ -29,8 +29,8 @@ def mclogin(inp, say=None):
         return "I couldn't log in using " + username + ", either the password is wrong or minecraft login servers are down D:"
 
 @hook.command
-def haspaid(inp):
-    ".haspaid <username> - Checks if a user has a premium Minecraft account"
+def mcpaid(inp):
+    ".mcpaid <username> -- Checks if a user has a premium Minecraft account"
     login = http.get("http://www.minecraft.net/haspaid.jsp?user=" + inp)
     if "true" in login:
         return "The account \'" + inp + "\' is a premium Minecraft account! :D"