Merge branch 'master' of ssh://github.com:22/Animosity/CraftIRC

Animosity · Oct 14, 2010 · a5d5bfb · a5d5bfb
2 parents c67c733 + caee78c
commit a5d5bfb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 25 deletions.
diff --git a/CraftIRC.java b/CraftIRC.java
@@ -3,6 +3,7 @@
 /**
  * @author Animosity
  * With various contributions and improvements by ricin
+ * 
  */
 
 public class CraftIRC extends Plugin {

diff --git a/Minebot.java b/Minebot.java
@@ -215,17 +215,17 @@ public void start()
 
 			log.info(CraftIRC.NAME + " v" + CraftIRC.VERSION + " loading.");
 
-         		if (this.irc_server_port == null || this.irc_server_port.equals("")) 
-			{
+     		if (this.irc_server_port == null || this.irc_server_port.equals("")) 
+     		{
 				if (this.irc_server_ssl) 
 				{
 					this.irc_server_port = "6697";
 				} 
 				else 
 				{
-                    			this.irc_server_port = "6667";
-                		}
-            		}
+                    this.irc_server_port = "6667";
+                }
+        	}
 
 			try {
 				this.setAutoNickChange(true);
@@ -238,25 +238,25 @@ public void start()
 	                		this.connect(this.irc_server,
 	                        		Integer.parseInt(this.irc_server_port),
 	                        		this.irc_server_pass, new TrustingSSLSocketFactory());
-	            		} 
+	            } 
 				else 
-	           		{
-	                		log.info(CraftIRC.NAME + " - Connecting to " 
-	                   			+ this.irc_server + ":"
-	                        		+ this.irc_server_port);
-	                		this.connect(this.irc_server,
-	                        		Integer.parseInt(this.irc_server_port),
-	                        		this.irc_server_pass);
-	            		}
+           		{
+            		log.info(CraftIRC.NAME + " - Connecting to " 
+               			+ this.irc_server + ":"
+                    	+ this.irc_server_port);
+            		this.connect(this.irc_server,
+                		Integer.parseInt(this.irc_server_port),
+                		this.irc_server_pass);
+            	}
 
-	            		if (this.isConnected()) 
-	            		{
-	                		log.info(CraftIRC.NAME + " - Connected");
-	            		} 
-	            		else 
-	            		{
-	                		log.info(CraftIRC.NAME + " - Connection failed!");
-	            		}
+        		if (this.isConnected()) 
+        		{
+            		log.info(CraftIRC.NAME + " - Connected");
+        		} 
+        		else 
+        		{
+            		log.info(CraftIRC.NAME + " - Connection failed!");
+        		}
 
 				this.authenticateBot(); // will always GHOST own registered nick if auth method is nickserv
 
@@ -267,7 +267,6 @@ public void start()
 
 
 			} catch (NumberFormatException e) {
-
 				e.printStackTrace();
 			} catch (NickAlreadyInUseException e) {
 				System.out.println("my handle is taken!");
@@ -333,7 +332,6 @@ public void joinAdminChannel()
 		else 
 		{ 
 			this.joinChannel(irc_admin_channel, irc_admin_channel_pass); 
-
 		}
 
 	}
@@ -372,7 +370,6 @@ public void onJoin(String channel, String sender, String login, String hostname)
 	{
 		if (channel.equalsIgnoreCase(this.irc_channel)) { this.irc_users_main = this.getUsers(channel); }
 		if (channel.equalsIgnoreCase(this.irc_admin_channel)) { this.irc_users_admin = this.getUsers(channel); }
-
 	}
 
 	// Update users
@@ -542,6 +539,7 @@ public String combineSplit(int initialPos, String[] parts, String delimiter) thr
 
 	public void onDisconnect()
 	{
+
 	    // Maybe check if disabled, and if not, start(); depending on a flag set in the settings?
 	}