Cleaned up some code

DoubleDoorDevelopment · Oct 25, 2014 · aa18057 · aa18057
1 parent 7c7a6f9
commit aa18057
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/main/java/net/doubledoordev/d3commands/commands/CommandHeal.java b/src/main/java/net/doubledoordev/d3commands/commands/CommandHeal.java
@@ -60,8 +60,7 @@ public void processCommand(final ICommandSender sender, final String[] args)
             if (sender instanceof  MinecraftServer || MinecraftServer.getServer().getConfigurationManager().func_152596_g(MinecraftServer.getServer().getConfigurationManager().func_152612_a(sender.getCommandSenderName()).getGameProfile()))
             {
                 EntityPlayerMP playerHeal = getPlayer(sender, args[0]);
-                playerHeal.setHealth(20);
-                playerHeal.getFoodStats().setFoodLevel(20);
+                doHeal(playerHeal);
                 //TODO: Add succes message, need to ask dries how to get stuff from the .lang files.
             }
             else sender.addChatMessage(new ChatComponentTranslation("commands.generic.permission"));
@@ -71,8 +70,7 @@ public void processCommand(final ICommandSender sender, final String[] args)
             EntityPlayerMP playerHeal = getCommandSenderAsPlayer(sender);
             if (args.length == 0)
             {
-                playerHeal.setHealth(20);
-                playerHeal.getFoodStats().setFoodLevel(20);
+                doHeal(playerHeal);
             }
             else
             {
@@ -81,6 +79,11 @@ public void processCommand(final ICommandSender sender, final String[] args)
         }
     }
 
+    private void doHeal(EntityPlayerMP playerHeal) {
+        playerHeal.setHealth(20);
+        playerHeal.getFoodStats().setFoodLevel(20); //Should I feed the player to?
+    }
+
     @Override
     public List addTabCompletionOptions(final ICommandSender sender, final String[] args)
     {

diff --git a/src/main/java/net/doubledoordev/d3commands/commands/CommandKill.java b/src/main/java/net/doubledoordev/d3commands/commands/CommandKill.java
@@ -25,8 +25,7 @@ public void processCommand(final ICommandSender sender, final String[] args)
             if (sender instanceof  MinecraftServer || MinecraftServer.getServer().getConfigurationManager().func_152596_g(MinecraftServer.getServer().getConfigurationManager().func_152612_a(sender.getCommandSenderName()).getGameProfile()))
             {
                 final EntityPlayerMP playerDead = getPlayer(sender, args[0]);
-                playerDead.attackEntityFrom(DamageSource.outOfWorld, Float.MAX_VALUE);
-                playerDead.addChatMessage(new ChatComponentTranslation("commands.kill.success"));
+                doKill(playerDead);
             }
             else sender.addChatMessage(new ChatComponentTranslation("commands.generic.permission"));
         }
@@ -35,8 +34,7 @@ public void processCommand(final ICommandSender sender, final String[] args)
             EntityPlayerMP playerDead = getCommandSenderAsPlayer(sender);
             if (args.length == 0)
             {
-                playerDead.attackEntityFrom(DamageSource.outOfWorld, Float.MAX_VALUE);
-                playerDead.addChatMessage(new ChatComponentTranslation("commands.kill.success"));
+                doKill(playerDead);
             }
             else
             {
@@ -45,6 +43,11 @@ public void processCommand(final ICommandSender sender, final String[] args)
         }
     }
 
+    private void doKill(EntityPlayerMP playerDead) {
+        playerDead.attackEntityFrom(DamageSource.outOfWorld, Float.MAX_VALUE);
+        playerDead.addChatMessage(new ChatComponentTranslation("commands.kill.success"));
+    }
+
     @Override
     public List addTabCompletionOptions(final ICommandSender sender, final String[] args)
     {