6 files changed, 71 insertions, 2 deletions

diff --git a/TODO.md b/TODO.md
index 92787ef..8e217d5 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,11 +2,13 @@
 
 ### Done!
 * get the player death event working
+* figure out how to convert milliseconds to an actual date and time for the end user
+* figure out commands and how to use them
+  * `about`
 
 ### For first release
 
 * figure out how to get the player.data file to add a user when one joins the server for the first time
-* figure out how to convert milliseconds to an actual date and time for the end user
 * figure out commands and how to use them
     * `about`
     * `resurrect PLAYER` (resurrects a player now if needed)
diff --git a/out/artifacts/Resurrection_jar/Resurrection.jar b/out/artifacts/Resurrection_jar/Resurrection.jar
index 1a1705e..5956672 100644
--- a/out/artifacts/Resurrection_jar/Resurrection.jar
+++ b/out/artifacts/Resurrection_jar/Resurrection.jar
diff --git a/out/production/Resurrection/net/brysonsteck/Resurrection/Resurrection.class b/out/production/Resurrection/net/brysonsteck/Resurrection/Resurrection.class
index 98142e0..f100f11 100644
--- a/out/production/Resurrection/net/brysonsteck/Resurrection/Resurrection.class
+++ b/out/production/Resurrection/net/brysonsteck/Resurrection/Resurrection.class
diff --git a/out/production/Resurrection/net/brysonsteck/Resurrection/commands/CommandResurrect.class b/out/production/Resurrection/net/brysonsteck/Resurrection/commands/CommandResurrect.class
new file mode 100644
index 0000000..574532c
--- /dev/null
+++ b/out/production/Resurrection/net/brysonsteck/Resurrection/commands/CommandResurrect.class
diff --git a/src/net/brysonsteck/Resurrection/Resurrection.java b/src/net/brysonsteck/Resurrection/Resurrection.java
index 0b90c1b..bfd8363 100644
--- a/src/net/brysonsteck/Resurrection/Resurrection.java
+++ b/src/net/brysonsteck/Resurrection/Resurrection.java
@@ -1,6 +1,8 @@
 package net.brysonsteck.Resurrection;
 
 import net.brysonsteck.Resurrection.commands.CommandAbout;
+import net.brysonsteck.Resurrection.commands.CommandResurrect;
+import org.bukkit.command.CommandExecutor;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -22,8 +24,9 @@ public class Resurrection extends JavaPlugin {
 
         // register commands
         this.getCommand("about").setExecutor(new CommandAbout());
+        this.getCommand("resurrect").setExecutor(new CommandResurrect());
 
-        System.out.println("Resurrection: I'm alive!");
+        System.out.println("[Resurrection] I'm alive!");
     }
 
     // end of spigot things
diff --git a/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java b/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java
new file mode 100644
index 0000000..eb24e7d
--- /dev/null
+++ b/src/net/brysonsteck/Resurrection/commands/CommandResurrect.java
@@ -0,0 +1,64 @@
+package net.brysonsteck.Resurrection.commands;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.GameMode;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+
+public class CommandResurrect implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender commandSender, Command command, String s, String[] strings) {
+        boolean valid = (strings.length != 1);
+        
+        if (commandSender instanceof Player) {
+            Player p = (Player) commandSender;
+            if (valid) {
+                Player resurrectPlayer = Bukkit.getPlayer(strings[0]);
+                if (resurrectPlayer == null) {
+                    p.sendMessage("That player does not exist! Failed to resurrect.");
+                    return false;
+                }
+                if (resurrectPlayer.getGameMode() == GameMode.SPECTATOR) {
+                    for (PotionEffect effect : resurrectPlayer.getActivePotionEffects())
+                        resurrectPlayer.removePotionEffect(effect.getType());
+                    resurrectPlayer.setGameMode(GameMode.SURVIVAL);
+                    Bukkit.broadcastMessage(strings[0] + " has been resurrected manually by an admin!");
+                    return true;
+                } else {
+                    p.sendMessage(strings[0] + " is not dead! Failed to resurrect.");
+                    return false;
+                }
+            } else {
+                System.out.println("Too few arguments!");
+                System.out.println("Usage: /resurrect PLAYER");
+                return false;
+            }
+        } else {
+            if (valid) {
+                Player resurrectPlayer = Bukkit.getPlayer(strings[0]);
+                if (resurrectPlayer == null) {
+                    System.out.println("That player does not exist! Failed to resurrect.");
+                    return false;
+                }
+                if (resurrectPlayer.getGameMode() == GameMode.SPECTATOR) {
+                    for (PotionEffect effect : resurrectPlayer.getActivePotionEffects())
+                        resurrectPlayer.removePotionEffect(effect.getType());
+                    resurrectPlayer.setGameMode(GameMode.SURVIVAL);
+                    Bukkit.broadcastMessage(strings[0] + " has been resurrected manually by an admin!");
+                    return true;
+                } else {
+                    System.out.println(strings[0] + " is not dead! Failed to resurrect.");
+                    return false;
+                }
+            } else {
+                System.out.println("Too few arguments!");
+                System.out.println("Usage: /resurrect PLAYER");
+                return false;
+            }
+        }
+    }
+}