1 files changed, 2 insertions, 4 deletions
diff --git a/lib/rbot/core/basics.rb b/lib/rbot/core/basics.rb
index c770cda7..44b800f5 100644
--- a/lib/rbot/core/basics.rb
+++ b/lib/rbot/core/basics.rb
@@ -11,13 +11,11 @@ class BasicsModule < CoreBotModule
 
   def listen(m)
     return unless m.kind_of?(PrivMessage)
-    if m.message =~ /^\001PING\s+(.+)\001/
-      ping_id = $1
+    if m.ctcp == 'PING'
+      m.ctcp_reply m.ctcp, m.message
       if m.private?
-        @bot.notice m.source, "\001PING #{ping_id}\001"
         @bot.irclog "@ #{m.source} pinged me"
       else
-        @bot.notice m.source, "\001PING #{ping_id}\001"
         @bot.irclog "@ #{m.source} pinged #{m.target}"
       end
     end