From 61dcce06dd2325534ea48386b6aba3732d15a2e3 Mon Sep 17 00:00:00 2001
From: RangerMauve <RangerMauve@hotmail.com>
Date: Sun, 30 Jun 2013 14:00:56 -0400
Subject: [PATCH] Attempting merge fix

---
 .../bukkit/discosheep/DiscoSheep.java         | 32 ++++++++++++++++++-
 .../bukkit/discosheep/DiscoUpdater.java       | 32 -------------------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/gibstick/bukkit/discosheep/DiscoSheep.java b/src/gibstick/bukkit/discosheep/DiscoSheep.java
index 85007cf..2762e2a 100644
--- a/src/gibstick/bukkit/discosheep/DiscoSheep.java
+++ b/src/gibstick/bukkit/discosheep/DiscoSheep.java
@@ -63,5 +63,35 @@ public final class DiscoSheep extends JavaPlugin {
         for (int i = 0; i < sheepArray.size(); i++) {
             //sheepArray.get(i) something something
         }
-    }
+    }
+	
+	public void playSounds(){
+		// TODO: generate list of players to send sounds to
+	}
+	
+	public void playSounds(Player player){
+		//TODO: Add sound playing here
+	}
+	
+	//	Called after discosheep is stopped
+	public void cleanUp(){
+		removeAllSheep();
+	}
+	
+	void scheduleUpdate(){
+		updater.runTaskLater(updater,frequency);
+	}
+	
+	public void startDisco(int frequency, int duration){
+		updater.start(frequency, duration);
+	}
+	
+	public void startDisco(){
+		this.startDisco();
+	}
+	
+	public void stopDisco(){
+		updater.stop();
+	}
+
 }
diff --git a/src/gibstick/bukkit/discosheep/DiscoUpdater.java b/src/gibstick/bukkit/discosheep/DiscoUpdater.java
index 7c92912..42c60c0 100644
--- a/src/gibstick/bukkit/discosheep/DiscoUpdater.java
+++ b/src/gibstick/bukkit/discosheep/DiscoUpdater.java
@@ -33,35 +33,3 @@ public class DiscoUpdater extends BukkitRunnable{
 		}
 	}
 }	
-
-/*
-
-	public void playSounds(){
-		// TODO: generate list of players to send sounds to
-	}
-	
-	public void playSounds(Player player){
-		//TODO: Add sound playing here
-	}
-	
-	//	Called after discosheep is stopped
-	public void cleanUp(){
-		removeAllSheep();
-	}
-	
-	void scheduleUpdate(){
-		updater.runTaskLater(updater,frequency);
-	}
-	
-	public void startDisco(int frequency, int duration){
-		updater.start(frequency, duration);
-	}
-	
-	public void startDisco(){
-		this.startDisco();
-	}
-	
-	public void stopDisco(){
-		updater.stop();
-	}
-*/
\ No newline at end of file