summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2011-12-12 23:00:21 +0000
committerKHobbits <rob@khobbits.co.uk>2011-12-12 23:00:21 +0000
commitf936cd5f2716ddbfd15054891b4bc335f1ad1347 (patch)
tree5ad3124aca6957d99accdcfc80c6c9f1257f4074
parent46840a686dadfe72d5b36842d936db3952827af2 (diff)
downloadEssentials-f936cd5f2716ddbfd15054891b4bc335f1ad1347.tar
Essentials-f936cd5f2716ddbfd15054891b4bc335f1ad1347.tar.gz
Essentials-f936cd5f2716ddbfd15054891b4bc335f1ad1347.tar.lz
Essentials-f936cd5f2716ddbfd15054891b4bc335f1ad1347.tar.xz
Essentials-f936cd5f2716ddbfd15054891b4bc335f1ad1347.zip
Updating to RB
CraftBukkit #1597 Bukkit #1073
-rw-r--r--Essentials/src/com/earth2me/essentials/OfflinePlayer.java6
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandtree.java8
-rw-r--r--Essentials/test/com/earth2me/essentials/FakeServer.java24
3 files changed, 38 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
index 45359a837..e05a07576 100644
--- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
+++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
@@ -816,4 +816,10 @@ public class OfflinePlayer implements Player
{
throw new UnsupportedOperationException("Not supported yet.");
}
+
+ @Override
+ public Player getKiller()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtree.java b/Essentials/src/com/earth2me/essentials/commands/Commandtree.java
index 538611972..20cc9d46f 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtree.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtree.java
@@ -35,6 +35,14 @@ public class Commandtree extends EssentialsCommand
{
tree = TreeType.TREE;
}
+ else if (args[0].equalsIgnoreCase("redmushroom"))
+ {
+ tree = TreeType.RED_MUSHROOM;
+ }
+ else if (args[0].equalsIgnoreCase("brownmushroom"))
+ {
+ tree = TreeType.BROWN_MUSHROOM;
+ }
else
{
throw new NotEnoughArgumentsException();
diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/com/earth2me/essentials/FakeServer.java
index d0fe51c9a..306f0d6a1 100644
--- a/Essentials/test/com/earth2me/essentials/FakeServer.java
+++ b/Essentials/test/com/earth2me/essentials/FakeServer.java
@@ -531,6 +531,24 @@ public class FakeServer implements Server
{
throw new UnsupportedOperationException("Not supported yet.");
}
+
+ @Override
+ public long getFirstPlayed()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public long getLastPlayed()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public boolean hasPlayedBefore()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
};
}
@@ -599,4 +617,10 @@ public class FakeServer implements Server
{
throw new UnsupportedOperationException("Not supported yet.");
}
+
+ @Override
+ public boolean getAllowEnd()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}