From a2a95ed840a130f5589526a7b8d93707390b3ffa Mon Sep 17 00:00:00 2001 From: montlikadani Date: Sun, 28 Oct 2018 19:41:46 +0100 Subject: [PATCH] Added acacia and dark oak tree types (#2001) @montlikadani * Update Commandbigtree.java * Update Commandbigtree.java * Update Commandtree.java --- .../src/com/earth2me/essentials/commands/Commandbigtree.java | 4 +++- .../src/com/earth2me/essentials/commands/Commandtree.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java b/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java index e6ca18efa..19b217ba5 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbigtree.java @@ -27,6 +27,8 @@ public class Commandbigtree extends EssentialsCommand { tree = TreeType.BIG_TREE; } else if (args.length > 0 && args[0].equalsIgnoreCase("jungle")) { tree = TreeType.JUNGLE; + } else if (args.length > 0 && args[0].equalsIgnoreCase("darkoak")) { + tree = TreeType.DARK_OAK; } else { throw new NotEnoughArgumentsException(); } @@ -44,7 +46,7 @@ public class Commandbigtree extends EssentialsCommand { @Override protected List getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) { if (args.length == 1) { - return Lists.newArrayList("redwood", "tree", "jungle"); + return Lists.newArrayList("redwood", "tree", "jungle", "darkoak"); } else { return Collections.emptyList(); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtree.java b/Essentials/src/com/earth2me/essentials/commands/Commandtree.java index 637192a09..f57505057 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtree.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtree.java @@ -32,6 +32,10 @@ public class Commandtree extends EssentialsCommand { } if (args[0].equalsIgnoreCase("jungle")) { tree = TreeType.SMALL_JUNGLE; + } else if (args[0].equalsIgnoreCase("acacia")) { + tree = TreeType.ACACIA; + } else if (args[0].equalsIgnoreCase("birch")) { + tree = TreeType.BIRCH; } if (tree == null) { throw new NotEnoughArgumentsException();